Hello community,
here is the log from the commit of package gcc43
checked in at Fri Nov 23 10:38:23 CET 2007.
--------
--- gcc43/cross-avr-gcc43.changes 2007-11-20 16:17:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc43/cross-avr-gcc43.changes 2007-11-22 15:52:11.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 22 15:49:51 CET 2007 - rguenther@suse.de
+
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
+
+-------------------------------------------------------------------
cross-hppa-gcc-icecream-backend.changes: same change
cross-i386-gcc-icecream-backend.changes: same change
cross-ia64-gcc-icecream-backend.changes: same change
cross-ppc64-gcc-icecream-backend.changes: same change
cross-ppc-gcc-icecream-backend.changes: same change
cross-s390-gcc-icecream-backend.changes: same change
cross-s390x-gcc-icecream-backend.changes: same change
cross-spu-gcc.changes: same change
cross-spu-gcc-static.changes: same change
cross-x86_64-gcc-icecream-backend.changes: same change
gcc43.changes: same change
libgcj43.changes: same change
New:
----
fix-smt-alias
pr34176.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-avr-gcc43.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -55,7 +55,7 @@
Url: http://gcc.gnu.org/
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -83,6 +83,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -141,6 +143,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -345,6 +349,10 @@
%defattr(-,root,root)
%{_prefix}
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
++++++ cross-hppa-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -34,7 +34,7 @@
Url: http://gcc.gnu.org/
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -62,6 +62,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -123,6 +125,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -361,6 +365,10 @@
/usr/share/icecream-envs
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
cross-i386-gcc-icecream-backend.spec: same change
cross-ia64-gcc-icecream-backend.spec: same change
cross-ppc64-gcc-icecream-backend.spec: same change
cross-ppc-gcc-icecream-backend.spec: same change
cross-s390-gcc-icecream-backend.spec: same change
cross-s390x-gcc-icecream-backend.spec: same change
++++++ cross-spu-gcc.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -45,7 +45,7 @@
Url: http://gcc.gnu.org/
License: GPL v2 or later
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -73,6 +73,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -126,6 +128,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -330,6 +334,10 @@
%defattr(-,root,root)
%{_prefix}
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
cross-spu-gcc-static.spec: same change
++++++ cross-x86_64-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -34,7 +34,7 @@
Url: http://gcc.gnu.org/
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -62,6 +62,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -123,6 +125,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -361,6 +365,10 @@
/usr/share/icecream-envs
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
++++++ gcc43.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -102,7 +102,7 @@
Url: http://gcc.gnu.org/
License: GPL v3 or later
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -137,6 +137,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -1120,10 +1122,20 @@
%ifarch ppc64
%define versnoflibdir %{libsubdir}/32/nof
%endif
+%if %{build_primary_64bit}
+%define versmainlibdirbi %{versmainlibdirbi32}
+%else
+%define versmainlibdirbi %{versmainlibdirbi64}
+%endif
%define mainlibdir %{_libdir}
%define mainlibdirbi32 %{_prefix}/lib
%define mainlibdirbi64 %{_prefix}/lib64
%define noflibdir %{_prefix}/lib/nof
+%if %{build_primary_64bit}
+%define mainlibdirbi %{mainlibdirbi32}
+%else
+%define mainlibdirbi %{mainlibdirbi64}
+%endif
# Now define a few macros that make it easy to package libs and
# related files just to the right package, without caring for the
# exact path the files are in.
@@ -1140,44 +1152,26 @@
%endif
%define biarchlib() %{nil}
%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{separate_bi32}
+%if !%{separate_biarch}
%if %{build_nof}
%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi32}/%1\
+%{mainlibdirbi}/%1\
%{noflibdir}/%1\
%{nil}
%else
%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi32}/%1\
+%{mainlibdirbi}/%1\
%{nil}
%endif
%else
%if %{build_nof}
-%define biarchlib() %{mainlibdirbi32}/%1\
+%define biarchlib() %{mainlibdirbi}/%1\
%{noflibdir}/%1\
%{nil}
%define mainlib() %{mainlibdir}/%1\
%{nil}
%else
-%define biarchlib() %{mainlibdirbi32}/%1\
-%{nil}
-%endif
-%endif
-%else
-%if !%{separate_bi64}
-%if %{build_nof}
-%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi64}/%1\
-%{noflibdir}/%1\
-%{nil}
-%else
-%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi64}/%1\
-%{nil}
-%endif
-%else
-%define biarchlib() %{mainlibdirbi64}/%1\
+%define biarchlib() %{mainlibdirbi}/%1\
%{nil}
%endif
%endif
@@ -1192,44 +1186,26 @@
%endif
%define versbiarchlib() %{nil}
%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{separate_bi32}
+%if !%{separate_biarch}
%if %{build_nof}
%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi32}/%1\
+%{versmainlibdirbi}/%1\
%{versnoflibdir}/%1\
%{nil}
%else
%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi32}/%1\
+%{versmainlibdirbi}/%1\
%{nil}
%endif
%else
%if %{build_nof}
-%define versbiarchlib() %{versmainlibdirbi32}/%1\
+%define versbiarchlib() %{versmainlibdirbi}/%1\
%{versnoflibdir}/%1\
%{nil}
%define versmainlib() %{versmainlibdir}/%1\
%{nil}
%else
-%define versbiarchlib() %{versmainlibdirbi32}/%1\
-%{nil}
-%endif
-%endif
-%else
-%if !%{separate_bi64}
-%if %{build_nof}
-%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi64}/%1\
-%{versnoflibdir}/%1\
-%{nil}
-%else
-%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi64}/%1\
-%{nil}
-%endif
-%else
-%define versbiarchlib() %{versmainlibdirbi64}/%1\
+%define versbiarchlib() %{versmainlibdirbi}/%1\
%{nil}
%endif
%endif
@@ -1251,6 +1227,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -1456,7 +1434,7 @@
cd obj-%{GCCDIST}
# Work around tail/head -1 changes
export _POSIX2_VERSION=199209
-export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi32}:$RPM_BUILD_ROOT%{mainlibdirbi64}
+export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi}
%if 0%{?building_libjava:1}
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
@@ -1469,11 +1447,7 @@
libgomp libstdc++ libsupc++ libgcj-tools libgij; do
rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la
%if %{biarch}
-%if %{build_primary_64bit}
- rm -f $RPM_BUILD_ROOT%{versmainlibdirbi32}/$lib.la
-%else
- rm -f $RPM_BUILD_ROOT%{versmainlibdirbi64}/$lib.la
-%endif
+ rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
%endif
done
mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -1553,24 +1527,14 @@
ln -sf %{mainlibdir}/`readlink $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
%if %{biarch}
-%if %{build_primary_64bit}
- if test -d $RPM_BUILD_ROOT%{versmainlibdirbi32}; then
- for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi32} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}/
- done
- ln -sf %{mainlibdirbi32}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so
- fi
-%else
- if test -d $RPM_BUILD_ROOT%{versmainlibdirbi64}; then
- for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi64} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}/
+ if test -d $RPM_BUILD_ROOT%{versmainlibdirbi}; then
+ for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi} -maxdepth 1 -name "$libname.so.*"`; do
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi}/
done
- ln -sf %{mainlibdirbi64}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so
+ ln -sf %{mainlibdirbi}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
+ $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
fi
%endif
-%endif
done
# LIBJAVA-DELETE-BEGIN
# Move libgcc_s around
@@ -1672,11 +1636,7 @@
mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
rm -f $RPM_BUILD_ROOT%{mainlibdir}/libffi.la
%if %{biarch}
-%if %{build_primary_64bit}
-rm -f $RPM_BUILD_ROOT%{mainlibdirbi32}/libffi.la
-%else
-rm -f $RPM_BUILD_ROOT%{mainlibdirbi64}/libffi.la
-%endif
+rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
%endif
# security files have broken install locations, also they cause conflicts
# between libgcj versions. Simply delete them here, libgcj will use its
@@ -2221,6 +2181,10 @@
%endif
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
++++++ libgcj43.spec ++++++
--- /var/tmp/diff_new_pack.US5086/_old 2007-11-23 10:37:03.000000000 +0100
+++ /var/tmp/diff_new_pack.US5086/_new 2007-11-23 10:37:03.000000000 +0100
@@ -114,7 +114,7 @@
Url: http://gcc.gnu.org/
License: GPL v2 or later; LGPL v2.1 or later
Version: 4.3.0_20071118
-Release: 1
+Release: 2
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -149,6 +149,8 @@
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
Patch28: pr34148.diff
+Patch29: pr34176.diff
+Patch30: fix-smt-alias
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -384,10 +386,20 @@
%ifarch ppc64
%define versnoflibdir %{libsubdir}/32/nof
%endif
+%if %{build_primary_64bit}
+%define versmainlibdirbi %{versmainlibdirbi32}
+%else
+%define versmainlibdirbi %{versmainlibdirbi64}
+%endif
%define mainlibdir %{_libdir}
%define mainlibdirbi32 %{_prefix}/lib
%define mainlibdirbi64 %{_prefix}/lib64
%define noflibdir %{_prefix}/lib/nof
+%if %{build_primary_64bit}
+%define mainlibdirbi %{mainlibdirbi32}
+%else
+%define mainlibdirbi %{mainlibdirbi64}
+%endif
# Now define a few macros that make it easy to package libs and
# related files just to the right package, without caring for the
# exact path the files are in.
@@ -404,44 +416,26 @@
%endif
%define biarchlib() %{nil}
%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{separate_bi32}
+%if !%{separate_biarch}
%if %{build_nof}
%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi32}/%1\
+%{mainlibdirbi}/%1\
%{noflibdir}/%1\
%{nil}
%else
%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi32}/%1\
+%{mainlibdirbi}/%1\
%{nil}
%endif
%else
%if %{build_nof}
-%define biarchlib() %{mainlibdirbi32}/%1\
+%define biarchlib() %{mainlibdirbi}/%1\
%{noflibdir}/%1\
%{nil}
%define mainlib() %{mainlibdir}/%1\
%{nil}
%else
-%define biarchlib() %{mainlibdirbi32}/%1\
-%{nil}
-%endif
-%endif
-%else
-%if !%{separate_bi64}
-%if %{build_nof}
-%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi64}/%1\
-%{noflibdir}/%1\
-%{nil}
-%else
-%define mainlib() %{mainlibdir}/%1\
-%{mainlibdirbi64}/%1\
-%{nil}
-%endif
-%else
-%define biarchlib() %{mainlibdirbi64}/%1\
+%define biarchlib() %{mainlibdirbi}/%1\
%{nil}
%endif
%endif
@@ -456,44 +450,26 @@
%endif
%define versbiarchlib() %{nil}
%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{separate_bi32}
+%if !%{separate_biarch}
%if %{build_nof}
%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi32}/%1\
+%{versmainlibdirbi}/%1\
%{versnoflibdir}/%1\
%{nil}
%else
%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi32}/%1\
+%{versmainlibdirbi}/%1\
%{nil}
%endif
%else
%if %{build_nof}
-%define versbiarchlib() %{versmainlibdirbi32}/%1\
+%define versbiarchlib() %{versmainlibdirbi}/%1\
%{versnoflibdir}/%1\
%{nil}
%define versmainlib() %{versmainlibdir}/%1\
%{nil}
%else
-%define versbiarchlib() %{versmainlibdirbi32}/%1\
-%{nil}
-%endif
-%endif
-%else
-%if !%{separate_bi64}
-%if %{build_nof}
-%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi64}/%1\
-%{versnoflibdir}/%1\
-%{nil}
-%else
-%define versmainlib() %{versmainlibdir}/%1\
-%{versmainlibdirbi64}/%1\
-%{nil}
-%endif
-%else
-%define versbiarchlib() %{versmainlibdirbi64}/%1\
+%define versbiarchlib() %{versmainlibdirbi}/%1\
%{nil}
%endif
%endif
@@ -515,6 +491,8 @@
%patch25
%patch27
%patch28
+%patch29
+%patch30
%patch51
%patch55
%patch57
@@ -720,7 +698,7 @@
cd obj-%{GCCDIST}
# Work around tail/head -1 changes
export _POSIX2_VERSION=199209
-export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi32}:$RPM_BUILD_ROOT%{mainlibdirbi64}
+export LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi}
%if 0%{?building_libjava:1}
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
@@ -733,11 +711,7 @@
libgomp libstdc++ libsupc++ libgcj-tools libgij; do
rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la
%if %{biarch}
-%if %{build_primary_64bit}
- rm -f $RPM_BUILD_ROOT%{versmainlibdirbi32}/$lib.la
-%else
- rm -f $RPM_BUILD_ROOT%{versmainlibdirbi64}/$lib.la
-%endif
+ rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
%endif
done
mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -771,23 +745,13 @@
ln -sf %{mainlibdir}/`readlink $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
%if %{biarch}
-%if %{build_primary_64bit}
- if test -d $RPM_BUILD_ROOT%{versmainlibdirbi32}; then
- for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi32} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}/
+ if test -d $RPM_BUILD_ROOT%{versmainlibdirbi}; then
+ for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi} -maxdepth 1 -name "$libname.so.*"`; do
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi}/
done
- ln -sf %{mainlibdirbi32}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so
+ ln -sf %{mainlibdirbi}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
+ $RPM_BUILD_ROOT%{versmainlibdirbi}/$libname.so
fi
-%else
- if test -d $RPM_BUILD_ROOT%{versmainlibdirbi64}; then
- for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi64} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}/
- done
- ln -sf %{mainlibdirbi64}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
- $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so
- fi
-%endif
%endif
done
%if %{build_ada}
@@ -870,11 +834,7 @@
mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
rm -f $RPM_BUILD_ROOT%{mainlibdir}/libffi.la
%if %{biarch}
-%if %{build_primary_64bit}
-rm -f $RPM_BUILD_ROOT%{mainlibdirbi32}/libffi.la
-%else
-rm -f $RPM_BUILD_ROOT%{mainlibdirbi64}/libffi.la
-%endif
+rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
%endif
# security files have broken install locations, also they cause conflicts
# between libgcj versions. Simply delete them here, libgcj will use its
@@ -1059,6 +1019,10 @@
%endif
%changelog
+* Thu Nov 22 2007 - rguenther@suse.de
+- Simplify biarch rpm-macros.
+- Add patch for PR34176. [#342236]
+- Add another alias fix.
* Tue Nov 20 2007 - rguenther@suse.de
- Update to SVN trunk head (r130276).
- Revert fix for PR25950.
++++++ fix-smt-alias ++++++
2007-11-20 Richard Guenther