rpms/texinfo/devel texinfo-4.3-zlib.patch, 1.3, 1.4 texinfo.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/texinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8760

Modified Files:
	texinfo-4.3-zlib.patch texinfo.spec 
Log Message:
* Mon Jan 16 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8
- Ignore scriptlet failures with --excludedocs (#166958)
- Don't link texindex to zlib, don't pretend to link to zlib statically


texinfo-4.3-zlib.patch:
 Makefile.in    |    2 -
 install-info.c |   87 ++++++++-------------------------------------------------
 2 files changed, 14 insertions(+), 75 deletions(-)

Index: texinfo-4.3-zlib.patch
===================================================================
RCS file: /cvs/dist/rpms/texinfo/devel/texinfo-4.3-zlib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- texinfo-4.3-zlib.patch	9 Sep 2004 13:17:03 -0000	1.3
+++ texinfo-4.3-zlib.patch	16 Jan 2006 04:27:06 -0000	1.4
@@ -1,16 +1,16 @@
---- texinfo-4.7/util/Makefile.in.zlib	2004-04-09 22:32:26.000000000 +0100
-+++ texinfo-4.7/util/Makefile.in	2004-06-25 09:59:33.990117203 +0100
-@@ -157,7 +157,7 @@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lz
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
---- texinfo-4.7/util/install-info.c.zlib	2004-03-29 13:44:23.000000000 +0100
-+++ texinfo-4.7/util/install-info.c	2004-06-25 10:00:23.115729565 +0100
+--- texinfo-4.8/util/Makefile.in.zlib	2004-12-31 19:01:49.000000000 +0100
++++ texinfo-4.8/util/Makefile.in	2006-01-16 04:59:19.000000000 +0100
+@@ -83,7 +83,7 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
+ ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
+-ginstall_info_LDADD = $(LDADD)
++ginstall_info_LDADD = $(LDADD) -lz
+ am__DEPENDENCIES_1 =
+ ginstall_info_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1)
+ texindex_SOURCES = texindex.c
+--- texinfo-4.8/util/install-info.c.zlib	2004-04-11 19:56:47.000000000 +0200
++++ texinfo-4.8/util/install-info.c	2006-01-15 15:02:11.000000000 +0100
 @@ -20,6 +20,7 @@
  
  #include "system.h"


Index: texinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- texinfo.spec	9 Dec 2005 22:43:35 -0000	1.30
+++ texinfo.spec	16 Jan 2006 04:27:06 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files.
 Name: texinfo
 Version: 4.8
-Release: 7.1
+Release: 8
 License: GPL
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -38,7 +38,7 @@
 # ugly method of doing it (triggers which fire on set intersection would
 # be better), but it's the best we can do for now. Talk to Erik before
 # removing this.
-Prereq: bash 
+Prereq: bash
 
 %description -n info
 The GNU project uses the texinfo file format for much of its
@@ -55,13 +55,11 @@
 %configure
 make %{?_smp_mflags}
 
-make -C util LIBS=%{_libdir}/libz.a
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/sbin
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 pushd ${RPM_BUILD_ROOT}
   install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1
@@ -79,19 +77,20 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || :
 fi
 
 %post -n info
-/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir || :
 
 %preun -n info
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir \
+	|| :
 fi
 
 %files -f %{name}.lang
@@ -112,7 +111,6 @@
 
 %files -n info
 %defattr(-,root,root)
-#%config(missingok) /etc/X11/applnk/Utilities/info.desktop
 %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir
 %{_bindir}/info
 %{_bindir}/infokey
@@ -125,6 +123,10 @@
 %{_mandir}/man5/info.5*
 
 %changelog
+* Mon Jan 16 2006 Miloslav Trmac <mitr at redhat.com> - 4.8-8
+- Ignore scriptlet failures with --excludedocs (#166958)
+- Don't link texindex to zlib, don't pretend to link to zlib statically
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt