rpms/texinfo/F-8 texinfo-4.11-direntry.patch, NONE, 1.1 texinfo.spec, 1.46, 1.47

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31279

Modified Files:
	texinfo.spec 
Added Files:
	texinfo-4.11-direntry.patch 
Log Message:
fix direntry

texinfo-4.11-direntry.patch:

--- NEW FILE texinfo-4.11-direntry.patch ---
--- texinfo-4.11/makeinfo/cmds.c_old	2007-07-15 19:36:19.000000000 +0200
+++ texinfo-4.11/makeinfo/cmds.c	2007-12-10 15:11:04.000000000 +0100
@@ -1637,11 +1637,16 @@
 
       if (!no_headers && !html)
         {
+	  /* use add_* instead of insert_* because otherwise the
+	  file header ("This is ...") will end up inside the
+	  dir section markers.  */
           kill_self_indent (-1); /* make sure there's no indentation */
-          insert_string ("INFO-DIR-SECTION ");
-          insert_string (line);
-          insert ('\n');
-        }
+	  cm_noindent (); /* make sure again */
+	  add_word ("INFO-DIR-SECTION ");
+	  add_word (line);
+	  add_char ('\n');
+
+         }
 
       free (line);
     }


Index: texinfo.spec
===================================================================
RCS file: /cvs/extras/rpms/texinfo/F-8/texinfo.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- texinfo.spec	13 Nov 2007 12:08:52 -0000	1.46
+++ texinfo.spec	10 Dec 2007 15:10:03 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -10,9 +10,10 @@
 Source2: texi2pdf.man
 Patch0: texinfo-4.11-zlib.patch
 Patch1: texinfo-4.11-res_win_segfault.patch
+Patch2: texinfo-4.11-direntry.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, ncurses-devel
 
 # Redefine this so "dir" in the info directory isn't compressed
@@ -61,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .res_win_segfault
+%patch2 -p1 -b .direntry
 
 %build
 
@@ -139,6 +141,11 @@
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Mon Dec 10 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-3
+- Don't insert description ("This is...") into the direntry section
+  of some generated files
+  Resolves: #394191
+
 * Tue Nov 13 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-2
 - Fix info crashes when resizing window
   Resolves: #243971