[rcs] Fix some man page vs. help incompatibilities

[Honza Horak]

commit 9c91bf52169fbbdd2bc85c731def24e576913025
Author: Honza Horák <hhorak at redhat.com>
Date:   Thu Apr 4 14:25:03 2013 +0200

    Fix some man page vs. help incompatibilities

 rcs-5.8-manhelp.patch |   50 +++++++++++++++++++++++++++++++++++++++++++++++++
 rcs.spec              |    3 ++
 2 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/rcs-5.8-manhelp.patch b/rcs-5.8-manhelp.patch
new file mode 100644
index 0000000..91fadad
--- /dev/null
+++ b/rcs-5.8-manhelp.patch
@@ -0,0 +1,50 @@
+diff -up rcs-5.8.2/src/co.c.manhelp rcs-5.8.2/src/co.c
+--- rcs-5.8.2/src/co.c.manhelp	2013-04-04 13:11:20.213882212 +0200
++++ rcs-5.8.2/src/co.c	2013-04-04 13:14:31.349888200 +0200
+@@ -779,6 +779,7 @@ Options:
+   -jJOINS       Merge using JOINS, a list of REV:REV pairs;
+                 this option is obsolete -- see rcsmerge(1).
+   -sSTATE       Select matching state STATE.
++  -S            Turns on same user locks, so user cannot check out the same file twice.
+   -T            Preserve the modification time on the RCS file
+                 even if it changes because a lock is added or removed.
+   -wWHO         Select matching login WHO.
+diff -up rcs-5.8.2/src/rcsdiff.c.manhelp rcs-5.8.2/src/rcsdiff.c
+--- rcs-5.8.2/src/rcsdiff.c.manhelp	2013-04-04 13:26:03.491909881 +0200
++++ rcs-5.8.2/src/rcsdiff.c	2013-04-04 13:26:27.266910626 +0200
+@@ -465,6 +465,7 @@ Options:
+   -rREV         (zero, one, or two times) Name a revision.
+   -kSUBST       Substitute using mode SUBST (see co(1)).
+   -q            Quiet mode.
++  -T            No effect; it is present for compatibility with other RCS commands.
+   -V            Like --version.
+   -VN           Emulate RCS version N.
+   -xSUFF        Specify SUFF as a slash-separated list of suffixes
+diff -up rcs-5.8.2/src/rcsmerge.c.manhelp rcs-5.8.2/src/rcsmerge.c
+--- rcs-5.8.2/src/rcsmerge.c.manhelp	2013-04-04 13:21:02.043900438 +0200
++++ rcs-5.8.2/src/rcsmerge.c	2013-04-04 13:24:40.538907282 +0200
+@@ -213,10 +213,13 @@ main (int argc, char **argv)
+ /*:help
+ [options] file
+ Options:
++  -A            Merge all changes leading from file2 to file3 into file1.
++  -E|-e         Specify conflict styles that generate less information than -A.
+   -p[REV]       Write to stdout instead of overwriting the working file.
+   -q[REV]       Quiet mode.
+   -rREV         (one or two times) specify a revision.
+   -kSUBST       Substitute using mode SUBST (see co(1)).
++  -T            No effect; it is present for compatibility with other RCS commands.
+   -V            Like --version.
+   -VN           Emulate RCS version N.
+   -xSUFF        Specify SUFF as a slash-separated list of suffixes
+diff -up rcs-5.8.2/src/rlog.c.manhelp rcs-5.8.2/src/rlog.c
+--- rcs-5.8.2/src/rlog.c.manhelp	2013-04-04 13:25:03.395907998 +0200
++++ rcs-5.8.2/src/rlog.c	2013-04-04 13:25:47.643909384 +0200
+@@ -1011,6 +1011,7 @@ Options:
+   -sSTATES      Select revisions with state in STATES (comma-separated list).
+   -w[WHO]       Select revisions checked in by WHO (comma-separated list),
+                 or by the user if WHO is omitted.
++  -T            No effect; it is present for compatibility with other RCS commands.
+   -V            Like --version.
+   -VN           Emulate RCS version N.
+   -xSUFF        Specify SUFF as a slash-separated list of suffixes
diff --git a/rcs.spec b/rcs.spec
index 1fbbbf3..9f83cb1 100644
--- a/rcs.spec
+++ b/rcs.spec
@@ -9,6 +9,7 @@ Source: ftp://ftp.gnu.org/gnu/rcs/%{name}-%{version}.tar.gz
 Patch0: rcs-5.8-build-tweaks.patch
 Patch1: rcs-5.8-sameuserlocks.patch
 Patch2: rcs-5.8-newsvnsyntax.patch
+Patch3: rcs-5.8-manhelp.patch
 Provides: bundled(gnulib)
 BuildRequires: autoconf
 BuildRequires: groff
@@ -33,6 +34,7 @@ different versions of files.
 %patch0 -p1 -b .build-tweaks
 %patch1 -p1 -b .sameuserlocks
 %patch2 -p1 -b .newsvnsyntax
+%patch3 -p1 -b .manhelp
 autoconf
 
 %build
@@ -67,6 +69,7 @@ fi
 %changelog
 * Thu Apr  4 2013 Honza Horak <hhorak at redhat.com> - 5.8.2-1
 - Update to upstream 5.8.2
+- Fix some man page vs. help incompatibilities
 
 * Thu Jan 24 2013 Honza Horak <hhorak at redhat.com> - 5.8.1-5
 - Remove sendmail from build requirements, it's not configured to be used