Scott Shambarger's Red Hat 8 rpmbuild fixes

diff --git a/procps.spec b/procps.spec
index fd9690d8fa9a62c8af287254cb8ac7649f0081da..fb1f0203d96c74be5b4342bce59d188a8e5143f8 100644 (file)
--- a/procps.spec
+++ b/procps.spec
@@ -44,4 +44,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(555,root,root) /usr/bin/*
 
 %attr(0644,root,root) /usr/share/man/man1/*
+%attr(0644,root,root) /usr/share/man/man5/*
 %attr(0644,root,root) /usr/share/man/man8/*

diff --git a/ps/module.mk b/ps/module.mk
index 8510204c6964439f03ed49831ea3c1fe5df3f29d..e3ab74b16a13124cbf5a9d4e2ef095223e7bdf3a 100755 (executable)
--- a/ps/module.mk
+++ b/ps/module.mk
@@ -33,8 +33,8 @@ ps/stacktrace.o: ps/stacktrace.c
 
 
 $(bin)ps: ps/ps
-       install --mode a=rx --strip $< $@
+       $(install) --mode a=rx --strip $< $@
 
 $(man1)ps.1 : ps/ps.1
-       install --mode a=r $< $@
+       $(install) --mode a=r $< $@
        -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz

diff --git a/top.c b/top.c
index 006d2cac39709effdb86f7c7ebb854d8816c7c67..a4e257521934098c8fe1bcdce3f07464c8ec31b8 100644 (file)
--- a/top.c
+++ b/top.c
@@ -3237,8 +3237,8 @@ int main (int dont_care_argc, char **argv)
          if (chin(0, &c, 1) <= 0) {
             fcntl(STDIN_FILENO, F_SETFL, file_flags);
             select(1, &fs, NULL, NULL, &tv);
+            fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK|file_flags);
          }
-         fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK|file_flags);
          if (chin(0, &c, 1) > 0) {
             fcntl(STDIN_FILENO, F_SETFL, file_flags);
             do_key((unsigned)c);