rpms/binutils/devel binutils.spec,1.176,1.177

[Jan Kratochvil]

Author: jkratoch

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31697

Modified Files:
	binutils.spec 
Log Message:
* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.20.51.0.2-2
- Fix rpm --excludedocs (BZ 515922).
- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)



Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- binutils.spec	12 Oct 2009 11:18:37 -0000	1.176
+++ binutils.spec	27 Oct 2009 18:56:42 -0000	1.177
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.20.51.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -297,34 +297,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
@@ -351,6 +368,10 @@ fi
 %endif # %{isnative}
 
 %changelog
+* Tue Oct 27 2009 Jan Kratochvil <jan.kratochvil at redhat.com> 2.20.51.0.2-2
+- Fix rpm --excludedocs (BZ 515922).
+- Fix spurious scriplet errors by `exit 0'. (BZ 517979, Nick Clifton)
+
 * Mon Oct 12 2009 Nick Clifton <nickc at redhat.com> 2.20.51.0.2-1
 - Rebase on 2.20 tarball.
 - Remove redundant moxie patch.