rpms/compat-gcc-32/devel compat-gcc-32.spec,1.22,1.23

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/compat-gcc-32/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1061

Modified Files:
	compat-gcc-32.spec 
Log Message:
3.2.3-57


Index: compat-gcc-32.spec
===================================================================
RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- compat-gcc-32.spec	3 Aug 2006 10:17:59 -0000	1.22
+++ compat-gcc-32.spec	3 Aug 2006 14:36:15 -0000	1.23
@@ -2,7 +2,7 @@
 %define LIBSTDCXXDATE 20040818
 %define DATE 20040701
 %define gcc_version 3.2.3
-%define gcc_release 56
+%define gcc_release 57
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define build_java 0
@@ -468,6 +468,17 @@
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib*/libiberty.a
 rm -f $RPM_BUILD_ROOT/lib*/libgcc_s*
 
+%ifarch %{multilib_64_archs}
+# Remove libraries for the other arch on multilib arches
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/lib*.a
+%else
+%ifarch sparc ppc
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/lib*.a
+%endif
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -636,8 +647,10 @@
 %{_prefix}/%{_lib}/libg2c.so.0*
 
 %changelog
-* Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-56
-- rebuilt
+* Thu Aug  3 2006 Jakub Jelinek  <jakub at redhat.com> 3.2.3-57
+- in 64-bit builds remove 32-bit /usr/lib/lib* libraries from the
+  buildroots (and similarly on 32-bit builds remove 64-bit /usr/lib64/lib*)
+  before AutoReq generation
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.3-55.fc5.1
 - rebuild