From b28607ee82129fa298082a607ab3b98dc2cacc73 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Aug 03 2006 14:36:15 +0000 Subject: 3.2.3-57 --- diff --git a/compat-gcc-32.spec b/compat-gcc-32.spec index 96c317a..ebb55c1 100644 --- a/compat-gcc-32.spec +++ b/compat-gcc-32.spec @@ -2,7 +2,7 @@ ExcludeArch: s390x %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 @@ chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libg2c.so.0.* 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 @@ fi %{_prefix}/%{_lib}/libg2c.so.0* %changelog -* Thu Aug 3 2006 Jakub Jelinek 3.2.3-56 -- rebuilt +* Thu Aug 3 2006 Jakub Jelinek 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 - 3.2.3-55.fc5.1 - rebuild