[cvs/f17] Fix texinfo documentation to work with texinfo-5.1

[Petr Pisar]

commit a47cad85659fb85175a3e5b358115e2ae3913132
Author: Petr Písař <ppisar at redhat.com>
Date:   Wed Jun 5 08:47:09 2013 +0200

    Fix texinfo documentation to work with texinfo-5.1

 cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch |   30 ++++++++++++++++++++
 cvs.spec                                           |    8 ++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch b/cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch
new file mode 100644
index 0000000..f11d2e9
--- /dev/null
+++ b/cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch
@@ -0,0 +1,30 @@
+From f40baecd3d09b1018185bcefde35464a79dbd68d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 5 Jun 2013 08:38:11 +0200
+Subject: [PATCH] doc: Add mandatory argument to @sp
+
+Texinfo-5.1 fails if @sp macro is not followed by a number. The
+numeric argument is mandatory according to Texinfo documentation.
+---
+ doc/cvs.texinfo | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
+index ad3a414..14bc79a 100644
+--- a/doc/cvs.texinfo
++++ b/doc/cvs.texinfo
+@@ -111,9 +111,9 @@ approved by the Free Software Foundation.
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{Version Management}
+- at sp
++ at sp 1
+ @center @titlefont{with}
+- at sp
++ at sp 1
+ @center @titlefont{CVS}
+ @sp 2
+ @center for @sc{cvs} @value{VERSION}
+-- 
+1.8.1.4
+
diff --git a/cvs.spec b/cvs.spec
index 9b7fd2c..54a7123 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -5,7 +5,7 @@
 
 Name: cvs
 Version: 1.11.23
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: Concurrent Versions System
 Group: Development/Tools
 URL: http://cvs.nongnu.org/
@@ -66,6 +66,8 @@ Patch26: cvs-1.11.23-Back-port-KeywordExpand-configuration-keyword.patch
 Patch27: cvs-1.11.23-Pass-server-IP-address-instead-of-hostname-to-GSSAPI.patch
 # CVE-2012-0804, bug #787683
 Patch28: cvs-1.11.23-Fix-proxy-response-parser.patch
+# Correct texinfo syntax, bug #970716, submitted to upstream as bug #39166
+Patch29: cvs-1.11.23-doc-Add-mandatory-argument-to-sp.patch
 
 %description
 CVS (Concurrent Versions System) is a version control system that can
@@ -151,6 +153,7 @@ pages in PDF.
 %patch26 -p1 -b .keywordexpand
 %patch27 -p1 -b .gssapi_dns
 %patch28 -p1 -b .proxy_response_parser
+%patch29 -p1 -b .texinfo_sp
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -259,6 +262,9 @@ fi
 
 
 %changelog
+* Wed Jun 05 2013 Petr Pisar <ppisar at redhat.com> - 1.11.23-27
+- Fix texinfo documentation to work with texinfo-5.1 (bug #970716)
+
 * Tue Feb 12 2013 Petr Pisar <ppisar at redhat.com> - 1.11.23-26
 - Correct handling systemd service (bug #737264)
 - Allow to stop all server instances by stopping cvs.target