rpms/texinfo/devel texinfo-4.11-direntry.patch, NONE, 1.1 texinfo.spec, 1.48, 1.49

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/texinfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24030

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/devel/texinfo.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- texinfo.spec	13 Nov 2007 10:52:30 -0000	1.48
+++ texinfo.spec	10 Dec 2007 14:56:42 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.11
-Release: 3%{?dist}
+Release: 4%{?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,13 +141,18 @@
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Mon Dec 10 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-4
+- 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-3
 - Fix info crashes when resizing window
-- Resolves: #243971
+  Resolves: #243971
 
 * Wed Nov  7 2007 Stepan Kasal <skasal at redhat.com> - 4.11-2
 - fix a typo in texinfo-tex summary
-- Resolves: #239216
+  Resolves: #239216
 
 * Wed Sep 19 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 4.11-1
 - Rebase to upstream texinfo-4.11 (update zlib.patch, drop