- Ignore scriptlet failures with --excludedocs (#166958)

- Don't link texindex to zlib, don't pretend to link to zlib statically

texinfo.spec

@@ -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 @@ Group: System Environment/Base
 # 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 @@ browser program for viewing texinfo files.
 %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 -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd}
 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 @@ fi
 
 %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 @@ fi
 %{_mandir}/man5/info.5*
 
 %changelog
+* Mon Jan 16 2006 Miloslav Trmac <mitr@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@redhat.com>
 - rebuilt