[texinfo/f14/master] Fix get_sectioning_number function problem

vcrhonek vcrhonek at fedoraproject.org
Wed Nov 10 11:30:51 UTC 2010


commit 10967763211b27eb4f9ded0632af986942c6dcaa
Author: Vitezslav Crhonek <Vitezslav.Crhonek at seznam.cz>
Date:   Wed Nov 10 12:30:48 2010 +0100

    Fix get_sectioning_number function problem

 texinfo-4.13a-makeinfo-sectioning.patch |   20 ++++++++++++++++++++
 texinfo.spec                            |    9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/texinfo-4.13a-makeinfo-sectioning.patch b/texinfo-4.13a-makeinfo-sectioning.patch
new file mode 100644
index 0000000..75a2986
--- /dev/null
+++ b/texinfo-4.13a-makeinfo-sectioning.patch
@@ -0,0 +1,20 @@
+diff -up texinfo-4.13/makeinfo/sectioning.c.orig texinfo-4.13/makeinfo/sectioning.c
+--- texinfo-4.13/makeinfo/sectioning.c.orig	2010-11-10 11:24:53.000000000 +0100
++++ texinfo-4.13/makeinfo/sectioning.c	2010-11-10 11:25:28.000000000 +0100
+@@ -256,14 +256,14 @@ current_chapter_number (void)
+     return xstrdup ("");
+   else if (enum_marker == APPENDIX_MAGIC)
+     {
+-      char s[1];
++      char s[2];
+       sprintf (s, "%c", numbers[0] + 64);
+       return xstrdup (s);
+     }
+   else
+     {
+       char s[5];
+-      sprintf (s, "%d", numbers[0]);
++      sprintf (s, "%4d", numbers[0]);
+       return xstrdup (s);
+     }
+ }
diff --git a/texinfo.spec b/texinfo.spec
index 48981a6..bae1879 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.13a
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -19,6 +19,8 @@ Patch3: texinfo-4.13a-powerpc.patch
 Patch4: texinfo-4.13a-help-index-segfault.patch
 # Patch5: already upstream, bz641534
 Patch5: texinfo-4.13a-texi2dvi-regexp.patch
+# Patch6: already upstream, bz651314
+Patch6: texinfo-4.13a-makeinfo-sectioning.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +68,7 @@ for printing using TeX.
 %patch3 -p1 -b .powerpc
 %patch4 -p1 -b .help-index-segfault
 %patch5 -p1 -b .texi2dvi-regexp
+%patch6 -p1 -b .makeinfo-sectioning
 
 %build
 %configure
@@ -165,6 +168,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Nov 10 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-12
+- Fix get_sectioning_number function problem
+  Resolves: #651314
+
 * Mon Oct 11 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.13a-11
 - Fix incompatible regexp with the latest version of egrep in texi2dvi script
   Resolves: #641534


More information about the scm-commits mailing list