rpms/spu-binutils/devel spu-binutils.spec,1.2,1.3

[Jochen Roth]

Author: jroth

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

Modified Files:
	spu-binutils.spec 
Log Message:
BZ 468996
File conflict when installing both, ppc and ppc64 rpm



Index: spu-binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spu-binutils/devel/spu-binutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spu-binutils.spec	20 Oct 2008 08:18:49 -0000	1.2
+++ spu-binutils.spec	29 Oct 2008 14:02:45 -0000	1.3
@@ -18,7 +18,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.18.50.0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -336,9 +336,9 @@
 %endif
 %if !%{isnative}
 %dir %{_prefix}/%{binutils_target}/bin
-%dir %{_prefix}/%{binutils_target}/lib
+%dir %{_prefix}/%{binutils_target}/%{_lib}
 %{_prefix}/%{binutils_target}/bin/*
-%{_prefix}/%{binutils_target}/lib/ldscripts
+%{_prefix}/%{binutils_target}/%{_lib}/ldscripts
 %else # %{isnative}
 %{_infodir}/[^b]*info*
 %{_infodir}/binutils*info*
@@ -353,6 +353,10 @@
 %endif # !%{isnative}
 
 %changelog
+* Tue Oct 29 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.18.50.0.9-8
+- ppc64 and ppc version of spu-binutils caused a file conflict (BZ 468996)
+- fixed some rpmlint complaints
+
 * Thu Oct 16 2008 Jochen Roth <jroth at linux.vnet.ibm.com> 2.18.50.0.9-7
 - Install binutils in /usr/spu/bin/ needed by spu-gcc (BZ 467056)
 
@@ -370,7 +374,7 @@
 - Fix .eh_frame_hdr build on C++ files with discarded common groups (BZ 458950).
 - Provide --build and --host to fix `rpmbuild --target' biarch builds.
 - Include %%{binutils_target}- filename prefix for binaries for cross builds.
-- Fix multilib conflict on %{_prefix}/include/bfd.h's BFD_HOST_64BIT_LONG_LONG.
+- Fix multilib conflict on %%{_prefix}/include/bfd.h's BFD_HOST_64BIT_LONG_LONG.
 
 * Mon Sep 15 2008 Jan Kratochvil <jan.kratochvil at redhat.com> 2.18.50.0.9-2
 - Package review, analysed by Jon Ciesla and Patrice Dumas (BZ 225615).
@@ -512,7 +516,7 @@
     handling with weak undefined symbols (Alan Modra, #211094)
 
 * Tue Sep 12 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-6
-- fix multilib conflict in %{_prefix}/include/bfd.h
+- fix multilib conflict in %%{_prefix}/include/bfd.h
 
 * Tue Sep 12 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-5
 - fix efi-app-ia64 magic number (#206002, BZ#3171)
@@ -954,7 +958,7 @@
 
 * Thu Apr  3 2003 Jakub Jelinek <jakub at redhat.com> 2.13.90.0.20-4
 - fix ppc32 plt reference counting
-- don't include %{_prefix}/%{_lib}/debug in the non-debuginfo package
+- don't include %%{_prefix}/%{_lib}/debug in the non-debuginfo package
   (#87729)
 
 * Mon Mar 31 2003 Jakub Jelinek <jakub at redhat.com> 2.13.90.0.20-3