[procps-ng/f19] RH man page scan (#948522)

[Jaromír Cápík]

commit 4755c7ee77dffa72a56a33f3633261e92b03a06c
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Fri Jul 19 15:01:39 2013 +0200

    RH man page scan (#948522)

 procps-ng-3.3.8-RH-man-page-check.patch |   42 +++++++++++++++++++++++++++++++
 procps-ng.spec                          |    7 ++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/procps-ng-3.3.8-RH-man-page-check.patch b/procps-ng-3.3.8-RH-man-page-check.patch
new file mode 100644
index 0000000..7076f16
--- /dev/null
+++ b/procps-ng-3.3.8-RH-man-page-check.patch
@@ -0,0 +1,42 @@
+diff --git a/sysctl.8 b/sysctl.8
+index d57ecd1..faf2255 100644
+--- a/sysctl.8
++++ b/sysctl.8
+@@ -92,7 +92,7 @@ Load settings from all system configuration files.
+ .br
+ /etc/sysctl.conf
+ .TP
+-\fB\-\-pattern\fR \fIpattern\fR
++\fB\-r\fR, \fB\-\-pattern\fR \fIpattern\fR
+ Only apply settings that match
+ .IR pattern .
+ The
+diff --git a/w.1 b/w.1
+index 5b2b264..7537f1d 100644
+--- a/w.1
++++ b/w.1
+@@ -49,7 +49,7 @@ field is shown by default.
+ \fB\-\-help\fR
+ Display help text and exit.
+ .TP
+-\fB\-\-ip\-addr\fR
++\fB\-i\fR, \fB\-\-ip\-addr\fR
+ Display IP address instead of hostname for \fBfrom\fR field.
+ .TP
+ \fB\-V\fR, \fB\-\-version\fR
+diff --git a/w.c b/w.c
+index fee9308..c80e117 100644
+--- a/w.c
++++ b/w.c
+@@ -475,9 +475,10 @@ int main(int argc, char **argv)
+ 	static const struct option longopts[] = {
+ 		{"no-header", no_argument, NULL, 'h'},
+ 		{"no-current", no_argument, NULL, 'u'},
+-		{"sort", no_argument, NULL, 's'},
++		{"short", no_argument, NULL, 's'},
+ 		{"from", no_argument, NULL, 'f'},
+ 		{"old-style", no_argument, NULL, 'o'},
++		{"ip-addr", no_argument, NULL, 'i'},
+ 		{"help", no_argument, NULL, HELP_OPTION},
+ 		{"version", no_argument, NULL, 'V'},
+ 		{NULL, 0, NULL, 0}
diff --git a/procps-ng.spec b/procps-ng.spec
index f9dedb3..6214fe1 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -4,7 +4,7 @@
 Summary: System and process monitoring utilities
 Name: procps-ng
 Version: 3.3.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: https://sourceforge.net/projects/procps-ng/
@@ -16,6 +16,7 @@ Patch1: 0002-library-for-atexit-support-fix-fileutils-for-EPIPE.patch
 Patch2: 0001-top-enable-screen-contents-preservation-at-end-of-jo.patch
 Patch3: 0001-top-refine-some-miscellaneous-signals-interrupt-stuf.patch
 Patch4: 0002-top-cursor-repositioning-includes-line-oriented-inpu.patch
+Patch5: procps-ng-3.3.8-RH-man-page-check.patch
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -76,6 +77,7 @@ System and process monitoring utilities development headers
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # The following stuff is needed for git archives only
@@ -141,6 +143,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
 %{_includedir}/proc
 
 %changelog
+* Fri Jul 19 2013 Jaromir Capik <jcapik at redhat.com> - 3.3.8-9
+- RH man page scan (#948522)
+
 * Tue Jul 02 2013 Jaromir Capik <jcapik at redhat.com> - 3.3.8-8
 - Extending the end-of-job patch disabling the screen content restoration