From fe1c75e336f9f8b8f9e1b80e95d0705b3366b424 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Oct 27 2009 20:08:45 +0000 Subject: - Fix rpm --excludedocs (BZ 515922). - Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton) --- diff --git a/binutils.spec b/binutils.spec index 8932c29..05d20b1 100644 --- a/binutils.spec +++ b/binutils.spec @@ -17,7 +17,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.19.51.0.14 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -305,34 +305,51 @@ rm -rf %{buildroot} %if %{isnative} %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info +# For --excludedocs: +if [ -e %{_infodir}/binutils.info.gz ] +then + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/configure.info.gz +fi exit 0 %preun -if [ $1 = 0 ] ;then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info +if [ $1 = 0 ] +then + if [ -e %{_infodir}/binutils.info.gz ] + then + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/configure.info.gz + fi fi exit 0 %postun -p /sbin/ldconfig %post devel -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info +if [ -e %{_infodir}/bfd.info.gz ] +then + /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz +fi +exit 0 %preun devel -if [ $1 = 0 ] ;then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info +if [ $1 = 0 ] +then + if [ -e %{_infodir}/bfd.info.gz ] + then + /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz + fi fi +exit 0 %endif # %{isnative} %files -f %{?cross}binutils.lang @@ -359,6 +376,10 @@ fi %endif # %{isnative} %changelog +* Tue Oct 27 2009 Jan Kratochvil 2.19.51.0.14-34 +- Fix rpm --excludedocs (BZ 515922). +- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton) + * Thu Oct 15 2009 Jakub Jelinek 2.19.51.0.14-33 - Add .cfi_sections support. (PR debug/40521)