Hello community,
here is the log from the commit of package gcc43
checked in at Fri Nov 30 16:13:38 CET 2007.
--------
--- gcc43/cross-avr-gcc43.changes 2007-11-22 15:52:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc43/cross-avr-gcc43.changes 2007-11-29 12:23:48.000000000 +0100
@@ -1,0 +2,18 @@
+Thu Nov 29 11:31:23 CET 2007 - rguenther@suse.de
+
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+
+-------------------------------------------------------------------
+Fri Nov 23 14:37:50 CET 2007 - rguenther@suse.de
+
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
+
+-------------------------------------------------------------------
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
Old:
----
fix-smt-alias
gcc-4.3.0-20071118.tar.bz2
pr34148.diff
pr34176.diff
New:
----
gcc-4.3.0-20071129.tar.bz2
pr33763.diff
pr34238.diff
pr34244.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-avr-gcc43.spec ++++++
--- /var/tmp/diff_new_pack.z29573/_old 2007-11-30 16:12:24.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:24.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cross-avr-gcc43 (Version 4.3.0_20071118)
+# spec file for package cross-avr-gcc43 (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -54,8 +54,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
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: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -82,9 +82,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -349,6 +349,18 @@
%defattr(-,root,root)
%{_prefix}
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
++++++ cross-hppa-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.z29573/_old 2007-11-30 16:12:24.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:24.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cross-hppa-gcc-icecream-backend (Version 4.3.0_20071118)
+# spec file for package cross-hppa-gcc-icecream-backend (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -33,8 +33,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
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: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -61,9 +61,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -334,8 +334,8 @@
install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++
install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc
for back in cc1 cc1plus; do
- install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back \
- $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back
+ install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \
+ $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back
done
libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/*; do \
ldd $bin | sed -n '\,^[^/]*\(/[^ ]*\).*,{ s//\1/; p; }' ;\
@@ -365,6 +365,18 @@
/usr/share/icecream-envs
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
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.z29573/_old 2007-11-30 16:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cross-spu-gcc (Version 4.3.0_20071118)
+# spec file for package cross-spu-gcc (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -44,8 +44,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
Url: http://gcc.gnu.org/
License: GPL v2 or later
-Version: 4.3.0_20071118
-Release: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -72,9 +72,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -334,6 +334,18 @@
%defattr(-,root,root)
%{_prefix}
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
cross-spu-gcc-static.spec: same change
++++++ cross-x86_64-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.z29573/_old 2007-11-30 16:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.3.0_20071118)
+# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -33,8 +33,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
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: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -61,9 +61,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -334,8 +334,8 @@
install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-g++ $RPM_BUILD_ROOT/env/usr/bin/g++
install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc
for back in cc1 cc1plus; do
- install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back \
- $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back
+ install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \
+ $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back
done
libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/*; do \
ldd $bin | sed -n '\,^[^/]*\(/[^ ]*\).*,{ s//\1/; p; }' ;\
@@ -365,6 +365,18 @@
/usr/share/icecream-envs
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
++++++ gcc43.spec ++++++
--- /var/tmp/diff_new_pack.z29573/_old 2007-11-30 16:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gcc43 (Version 4.3.0_20071118)
+# spec file for package gcc43 (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -101,8 +101,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
Url: http://gcc.gnu.org/
License: GPL v3 or later
-Version: 4.3.0_20071118
-Release: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -136,9 +136,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -877,23 +877,12 @@
%run_ldconfig
# PACKAGE-END
-%package java
-Summary: The GNU Java Compiler
-Group: Development/Languages/Java
-AutoReqProv: on
-Requires: gcc43 = %{version}-%{release}
-Requires: libgcj43-devel = %{version}
-
-%description java
-The Java compiler from the GCC-tools-suite.
-
-
-
%package -n libgcj43
# LIBJAVA-DELETE-END
Summary: Java Runtime Library for gcc
Group: System/Libraries
%define gcj_sover 9
+Recommends: libgcj43-jar = %{version}-%{release}
Provides: libgcj%{gcj_sover} = %{version}-%{release}
Obsoletes: libgcj%{gcj_sover} < %{version}-%{release}
AutoReqProv: on
@@ -910,15 +899,27 @@
%postun -n libgcj43
%run_ldconfig
+%package -n gcc43-java
+Summary: The GNU Java Compiler
+Group: Development/Languages/Java
+AutoReqProv: on
+Requires: gcc43 = %{version}
+Requires: libgcj43-devel = %{version}-%{release}
+
+%description -n gcc43-java
+The Java compiler from the GCC-tools-suite.
+
+
+
%package -n libgcj_bc43
Summary: Fake library for BC-ABI compatibility.
Group: System/Libraries
AutoReqProv: on
Provides: libgcj_bc1 = %{version}-%{release}
# make rpm happy
-Obsoletes: libgcj_bc42@variant@
+Obsoletes: libgcj_bc42
# make zypp happy
-Provides: libgcj_bc42@variant@
+Provides: libgcj_bc42
%description -n libgcj_bc43
A fake library that is used at link time only. It ensures that binaries
@@ -933,6 +934,15 @@
%postun -n libgcj_bc43
%run_ldconfig
+%package -n libgcj43-jar
+Summary: Java runtime library (jar files).
+Group: System/Libraries
+
+%description -n libgcj43-jar
+These are the jar files that go along with the gcj front end to gcc.
+
+
+
%package -n libgcj43-devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/Java
@@ -940,6 +950,7 @@
Requires: libstdc++43-devel = %{version}
Requires: libgcj%{gcj_sover} >= %{version}-%{release}
Requires: libgcj_bc1 >= %{version}-%{release}
+Requires: libgcj43-jar = %{version}-%{release}
Requires: gtk2-devel
Requires: libart_lgpl-devel
Requires: glibc-devel
@@ -1439,8 +1450,26 @@
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
+make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT
+make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)'
+# install-common also installs collect2, gcov and the g++ and gfortran driver
+%if %{build_cp}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/g++%{binsuffix}
+%endif
+%if %{build_fortran}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gfortran%{binsuffix}
+%endif
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gcov%{binsuffix}
+rm $RPM_BUILD_ROOT%{libsubdir}/collect2
%else
make install DESTDIR=$RPM_BUILD_ROOT
+%if %{build_java}
+make -C gcc java.uninstall DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_prefix}/bin/jcf-dump%{binsuffix}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm $RPM_BUILD_ROOT%{libsubdir}/jc1
+rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
+%endif
%endif
# Remove some useless .la files
for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
@@ -1645,8 +1674,8 @@
rm -r $RPM_BUILD_ROOT%{_libdir}/security
%endif
%if %{build_java}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
%if !%{build_libjava}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
@@ -1668,12 +1697,8 @@
%endif
%endif
%if 0%{?building_libjava:1}
-# For building libjava only we need to delete other manpages
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+# For building libjava only we need to delete other info docs
rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
-%else
# For building the java frontend we need to copy the ecj jar
mkdir -p $RPM_BUILD_ROOT%{libsubdir}
cp $RPM_SOURCE_DIR/ecj.jar $RPM_BUILD_ROOT%{libsubdir}
@@ -2025,19 +2050,30 @@
%{mainlibdir}/libgnarl-*.so
%{mainlibdir}/libgnat-*.so
%endif
+# LIBJAVA-DELETE-END
%if %{build_java}
+%if 0%{?building_libjava:1}
-%files java
+%files -n gcc43-java
%defattr(-,root,root)
%{_prefix}/bin/gcj%{binsuffix}
+%{_prefix}/bin/gcjh%{binsuffix}
+%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/jcf-dump%{binsuffix}
+%{_prefix}/bin/jv-convert%{binsuffix}
+%{_prefix}/bin/gc-analyze%{binsuffix}
%{libsubdir}/jc1
%{libsubdir}/jvgenmain
%{libsubdir}/ecj.jar
+%{libsubdir}/ecj1
%doc %{_mandir}/man1/gcj%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcjh%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
%doc %{_mandir}/man1/jcf-dump%{binsuffix}.1.gz
+%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
+%endif
%endif
-# LIBJAVA-DELETE-END
%if %{build_java}
%if %{build_libjava}
@@ -2047,8 +2083,6 @@
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
-%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
%{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}/classmap.db
# We usually do not multilib libjava
%if %{biarch_libjava}
@@ -2077,6 +2111,11 @@
%mainlib libgcj_bc.so.*
%endif
+%files -n libgcj43-jar
+%defattr(-,root,root)
+%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
+%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
+
%files -n libgcj43-devel
%defattr(-,root,root)
%dir %{_prefix}/include/c++
@@ -2097,7 +2136,6 @@
%{gxxinclude}/org
%{gxxinclude}/sun
%{libsubdir}/include/gcj
-%{libsubdir}/ecj1
%if %{biarch_libjava}
%versbiarchlib libgcj.so
%versbiarchlib libgcj.spec
@@ -2114,33 +2152,27 @@
%files -n gcc43-gij
%defattr(-,root,root)
-%{_prefix}/bin/gappletviewer%{binsuffix}
-%{_prefix}/bin/gjarsigner%{binsuffix}
-%{_prefix}/bin/gkeytool%{binsuffix}
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
-%{_prefix}/bin/grmid%{binsuffix}
-%{_prefix}/bin/jv-convert%{binsuffix}
-%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
+%{_prefix}/bin/gappletviewer%{binsuffix}
%{_prefix}/bin/gjar%{binsuffix}
-%{_prefix}/bin/gc-analyze%{binsuffix}
+%{_prefix}/bin/gjarsigner%{binsuffix}
%{_prefix}/bin/gjavah%{binsuffix}
+%{_prefix}/bin/gkeytool%{binsuffix}
%{_prefix}/bin/gnative2ascii%{binsuffix}
%{_prefix}/bin/gorbd%{binsuffix}
+%{_prefix}/bin/grmic%{binsuffix}
+%{_prefix}/bin/grmid%{binsuffix}
+%{_prefix}/bin/grmiregistry%{binsuffix}
%{_prefix}/bin/gserialver%{binsuffix}
%{_prefix}/bin/gtnameserv%{binsuffix}
-%{_prefix}/bin/gcjh%{binsuffix}
-%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmid%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/gkeytool%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjar%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjarsigner%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjavah%{binsuffix}.1.gz
%doc %{_mandir}/man1/gnative2ascii%{binsuffix}.1.gz
%doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz
@@ -2181,6 +2213,18 @@
%endif
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
++++++ libgcj43.spec ++++++
--- /var/tmp/diff_new_pack.z29573/_old 2007-11-30 16:12:25.000000000 +0100
+++ /var/tmp/diff_new_pack.z29573/_new 2007-11-30 16:12:25.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libgcj43 (Version 4.3.0_20071118)
+# spec file for package libgcj43 (Version 4.3.0_20071129)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -113,8 +113,8 @@
%define biarch_targets x86_64 s390x powerpc64 powerpc
Url: http://gcc.gnu.org/
License: GPL v2 or later; LGPL v2.1 or later
-Version: 4.3.0_20071118
-Release: 2
+Version: 4.3.0_20071129
+Release: 1
%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/_/-/')
@@ -148,9 +148,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -158,6 +158,7 @@
Summary: Java Runtime Library for gcc
Group: System/Libraries
%define gcj_sover 9
+Recommends: libgcj43-jar = %{version}-%{release}
Provides: libgcj%{gcj_sover} = %{version}-%{release}
Obsoletes: libgcj%{gcj_sover} < %{version}-%{release}
AutoReqProv: on
@@ -174,15 +175,27 @@
%postun
%run_ldconfig
+%package -n gcc43-java
+Summary: The GNU Java Compiler
+Group: Development/Languages/Java
+AutoReqProv: on
+Requires: gcc43 = %{version}
+Requires: libgcj43-devel = %{version}-%{release}
+
+%description -n gcc43-java
+The Java compiler from the GCC-tools-suite.
+
+
+
%package -n libgcj_bc43
Summary: Fake library for BC-ABI compatibility.
Group: System/Libraries
AutoReqProv: on
Provides: libgcj_bc1 = %{version}-%{release}
# make rpm happy
-Obsoletes: libgcj_bc42@variant@
+Obsoletes: libgcj_bc42
# make zypp happy
-Provides: libgcj_bc42@variant@
+Provides: libgcj_bc42
%description -n libgcj_bc43
A fake library that is used at link time only. It ensures that binaries
@@ -197,6 +210,15 @@
%postun -n libgcj_bc43
%run_ldconfig
+%package -n libgcj43-jar
+Summary: Java runtime library (jar files).
+Group: System/Libraries
+
+%description -n libgcj43-jar
+These are the jar files that go along with the gcj front end to gcc.
+
+
+
%package -n libgcj43-devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/Java
@@ -204,6 +226,7 @@
Requires: libstdc++43-devel = %{version}
Requires: libgcj%{gcj_sover} >= %{version}-%{release}
Requires: libgcj_bc1 >= %{version}-%{release}
+Requires: libgcj43-jar = %{version}-%{release}
Requires: gtk2-devel
Requires: libart_lgpl-devel
Requires: glibc-devel
@@ -703,8 +726,26 @@
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
+make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT
+make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)'
+# install-common also installs collect2, gcov and the g++ and gfortran driver
+%if %{build_cp}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/g++%{binsuffix}
+%endif
+%if %{build_fortran}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gfortran%{binsuffix}
+%endif
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gcov%{binsuffix}
+rm $RPM_BUILD_ROOT%{libsubdir}/collect2
%else
make install DESTDIR=$RPM_BUILD_ROOT
+%if %{build_java}
+make -C gcc java.uninstall DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_prefix}/bin/jcf-dump%{binsuffix}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm $RPM_BUILD_ROOT%{libsubdir}/jc1
+rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
+%endif
%endif
# Remove some useless .la files
for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
@@ -843,8 +884,8 @@
rm -r $RPM_BUILD_ROOT%{_libdir}/security
%endif
%if %{build_java}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
%if !%{build_libjava}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
@@ -866,17 +907,36 @@
%endif
%endif
%if 0%{?building_libjava:1}
-# For building libjava only we need to delete other manpages
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+# For building libjava only we need to delete other info docs
rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
-%else
# For building the java frontend we need to copy the ecj jar
mkdir -p $RPM_BUILD_ROOT%{libsubdir}
cp $RPM_SOURCE_DIR/ecj.jar $RPM_BUILD_ROOT%{libsubdir}
%endif
%if %{build_java}
+%if 0%{?building_libjava:1}
+
+%files -n gcc43-java
+%defattr(-,root,root)
+%{_prefix}/bin/gcj%{binsuffix}
+%{_prefix}/bin/gcjh%{binsuffix}
+%{_prefix}/bin/gcj-dbtool%{binsuffix}
+%{_prefix}/bin/jcf-dump%{binsuffix}
+%{_prefix}/bin/jv-convert%{binsuffix}
+%{_prefix}/bin/gc-analyze%{binsuffix}
+%{libsubdir}/jc1
+%{libsubdir}/jvgenmain
+%{libsubdir}/ecj.jar
+%{libsubdir}/ecj1
+%doc %{_mandir}/man1/gcj%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcjh%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
+%doc %{_mandir}/man1/jcf-dump%{binsuffix}.1.gz
+%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
+%endif
+%endif
+%if %{build_java}
%if %{build_libjava}
%files
@@ -885,8 +945,6 @@
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
-%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
%{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}/classmap.db
# We usually do not multilib libjava
%if %{biarch_libjava}
@@ -915,6 +973,11 @@
%mainlib libgcj_bc.so.*
%endif
+%files -n libgcj43-jar
+%defattr(-,root,root)
+%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
+%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
+
%files -n libgcj43-devel
%defattr(-,root,root)
%dir %{_prefix}/include/c++
@@ -935,7 +998,6 @@
%{gxxinclude}/org
%{gxxinclude}/sun
%{libsubdir}/include/gcj
-%{libsubdir}/ecj1
%if %{biarch_libjava}
%versbiarchlib libgcj.so
%versbiarchlib libgcj.spec
@@ -952,33 +1014,27 @@
%files -n gcc43-gij
%defattr(-,root,root)
-%{_prefix}/bin/gappletviewer%{binsuffix}
-%{_prefix}/bin/gjarsigner%{binsuffix}
-%{_prefix}/bin/gkeytool%{binsuffix}
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
-%{_prefix}/bin/grmid%{binsuffix}
-%{_prefix}/bin/jv-convert%{binsuffix}
-%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
+%{_prefix}/bin/gappletviewer%{binsuffix}
%{_prefix}/bin/gjar%{binsuffix}
-%{_prefix}/bin/gc-analyze%{binsuffix}
+%{_prefix}/bin/gjarsigner%{binsuffix}
%{_prefix}/bin/gjavah%{binsuffix}
+%{_prefix}/bin/gkeytool%{binsuffix}
%{_prefix}/bin/gnative2ascii%{binsuffix}
%{_prefix}/bin/gorbd%{binsuffix}
+%{_prefix}/bin/grmic%{binsuffix}
+%{_prefix}/bin/grmid%{binsuffix}
+%{_prefix}/bin/grmiregistry%{binsuffix}
%{_prefix}/bin/gserialver%{binsuffix}
%{_prefix}/bin/gtnameserv%{binsuffix}
-%{_prefix}/bin/gcjh%{binsuffix}
-%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmid%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/gkeytool%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjar%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjarsigner%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjavah%{binsuffix}.1.gz
%doc %{_mandir}/man1/gnative2ascii%{binsuffix}.1.gz
%doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz
@@ -1019,6 +1075,18 @@
%endif
%changelog
+* Thu Nov 29 2007 - rguenther@suse.de
+- Update to SVN trunk head (r130511). [#340981]
+- Add patch for PR33763. [#344524]
+- Add patch for PR34244. [#342603]
+- Add patch for PR34238.
+* Fri Nov 23 2007 - rguenther@suse.de
+- Build gcc43-java from libgcj43.spec.
+- Shuffle binaries back from gcc43-gij to gcc43-java retaining
+ only classpath tools in gcc43-gij.
+- Add libgcj43-jar package required by libgcj43-devel and only
+ recommended by libgcj43.
+- Fix icecream cross install directory.
* Thu Nov 22 2007 - rguenther@suse.de
- Simplify biarch rpm-macros.
- Add patch for PR34176. [#342236]
++++++ cross-icecream.spec.in ++++++
--- gcc43/cross-icecream.spec.in 2007-11-22 15:44:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc43/cross-icecream.spec.in 2007-11-24 19:56:21.000000000 +0100
@@ -55,8 +55,8 @@
install -s $RPM_BUILD_ROOT/inst%{_prefix}/bin/${BUILD_TARGET}-linux-gcc $RPM_BUILD_ROOT/env/usr/bin/gcc
for back in cc1 cc1plus; do
- install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back \
- $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%gcc_version/$back
+ install -s -D $RPM_BUILD_ROOT/inst%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back \
+ $RPM_BUILD_ROOT/env%{_libdir}/gcc/${BUILD_TARGET}-linux/%{gcc_dir_version}/$back
done
libs=`for bin in $RPM_BUILD_ROOT/env/usr/bin/*; do \
++++++ gcc-4.3.0-20071118.tar.bz2 -> gcc-4.3.0-20071129.tar.bz2 ++++++
gcc43/gcc-4.3.0-20071118.tar.bz2 /mounts/work_src_done/STABLE/gcc43/gcc-4.3.0-20071129.tar.bz2 differ: byte 11, line 1
++++++ gcc.spec.in ++++++
--- gcc43/gcc.spec.in 2007-11-22 15:52:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc43/gcc.spec.in 2007-11-29 15:09:38.000000000 +0100
@@ -117,7 +117,7 @@
URL: http://gcc.gnu.org/
License: GPL
-Version: 4.3.0_20071118
+Version: 4.3.0_20071129
Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
@@ -154,9 +154,9 @@
Patch24: tls-no-direct.diff
Patch25: pr27880.diff
Patch27: revert-pr25950.diff
-Patch28: pr34148.diff
-Patch29: pr34176.diff
-Patch30: fix-smt-alias
+Patch28: pr33763.diff
+Patch29: pr34244.diff
+Patch30: pr34238.diff
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
@@ -479,22 +479,12 @@
# PACKAGE-END
-%package java
-Summary: The GNU Java Compiler
-Group: Development/Languages/Java
-Autoreqprov: on
-Requires: gcc@base_ver@ = %{version}-%{release}
-Requires: libgcj@base_ver@-devel = %{version}
-
-%description java
-The Java compiler from the GCC-tools-suite.
-
-
%package -n libgcj@base_ver@
# LIBJAVA-DELETE-END
Summary: Java Runtime Library for gcc
Group: System/Libraries
%define gcj_sover 9
+Recommends: libgcj@base_ver@-jar = %{version}-%{release}
Provides: libgcj%{gcj_sover} = %{version}-%{release}
Obsoletes: libgcj%{gcj_sover} < %{version}-%{release}
Autoreqprov: on
@@ -510,15 +500,26 @@
%run_ldconfig
+%package -n gcc@base_ver@-java
+Summary: The GNU Java Compiler
+Group: Development/Languages/Java
+Autoreqprov: on
+Requires: gcc@base_ver@ = %{version}
+Requires: libgcj@base_ver@-devel = %{version}-%{release}
+
+%description -n gcc@base_ver@-java
+The Java compiler from the GCC-tools-suite.
+
+
%package -n libgcj_bc@base_ver@
Summary: Fake library for BC-ABI compatibility.
Group: Development/Libraries/Java
Autoreqprov: on
Provides: libgcj_bc1 = %{version}-%{release}
# make rpm happy
-Obsoletes: libgcj_bc42@variant@
+Obsoletes: libgcj_bc42
# make zypp happy
-Provides: libgcj_bc42@variant@
+Provides: libgcj_bc42
%description -n libgcj_bc@base_ver@
@@ -534,6 +535,14 @@
%run_ldconfig
+%package -n libgcj@base_ver@-jar
+Summary: Java runtime library (jar files).
+Group: Development/Libraries/Java
+
+%description -n libgcj@base_ver@-jar
+These are the jar files that go along with the gcj front end to gcc.
+
+
%package -n libgcj@base_ver@-devel
Summary: Include Files and Libraries mandatory for Development.
Group: Development/Libraries/Java
@@ -541,6 +550,7 @@
Requires: libstdc++@base_ver@-devel = %{version}
Requires: libgcj%{gcj_sover} >= %{version}-%{release}
Requires: libgcj_bc1 >= %{version}-%{release}
+Requires: libgcj@base_ver@-jar = %{version}-%{release}
Requires: gtk2-devel
Requires: libart_lgpl-devel
Requires: glibc-devel
@@ -989,8 +999,26 @@
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
+make -C gcc java.install-common DESTDIR=$RPM_BUILD_ROOT
+make -C gcc install-common DESTDIR=$RPM_BUILD_ROOT COMPILERS='jc1$(exeext) jvgenmain$(exeext)'
+# install-common also installs collect2, gcov and the g++ and gfortran driver
+%if %{build_cp}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/g++%{binsuffix}
+%endif
+%if %{build_fortran}
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gfortran%{binsuffix}
+%endif
+rm $RPM_BUILD_ROOT%{_prefix}/bin/gcov%{binsuffix}
+rm $RPM_BUILD_ROOT%{libsubdir}/collect2
%else
make install DESTDIR=$RPM_BUILD_ROOT
+%if %{build_java}
+make -C gcc java.uninstall DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT%{_prefix}/bin/jcf-dump%{binsuffix}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm $RPM_BUILD_ROOT%{libsubdir}/jc1
+rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
+%endif
%endif
# Remove some useless .la files
@@ -1208,8 +1236,8 @@
rm -r $RPM_BUILD_ROOT%{_libdir}/security
%endif
%if %{build_java}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
%if !%{build_libjava}
+rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
rm $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
@@ -1232,12 +1260,8 @@
%endif
%if 0%{?building_libjava:1}
-# For building libjava only we need to delete other manpages
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+# For building libjava only we need to delete other info docs
rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
-%else
# For building the java frontend we need to copy the ecj jar
mkdir -p $RPM_BUILD_ROOT%{libsubdir}
cp $RPM_SOURCE_DIR/ecj.jar $RPM_BUILD_ROOT%{libsubdir}
@@ -1595,20 +1619,31 @@
%{mainlibdir}/libgnarl-*.so
%{mainlibdir}/libgnat-*.so
%endif
+# LIBJAVA-DELETE-END
%if %{build_java}
-%files java
+%if 0%{?building_libjava:1}
+%files -n gcc@base_ver@-java
%defattr(-,root,root)
%{_prefix}/bin/gcj%{binsuffix}
+%{_prefix}/bin/gcjh%{binsuffix}
+%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/jcf-dump%{binsuffix}
+%{_prefix}/bin/jv-convert%{binsuffix}
+%{_prefix}/bin/gc-analyze%{binsuffix}
%{libsubdir}/jc1
%{libsubdir}/jvgenmain
%{libsubdir}/ecj.jar
+%{libsubdir}/ecj1
%doc %{_mandir}/man1/gcj%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcjh%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
%doc %{_mandir}/man1/jcf-dump%{binsuffix}.1.gz
+%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
+%endif
%endif
-# LIBJAVA-DELETE-END
%if %{build_java}
%if %{build_libjava}
@@ -1618,8 +1653,6 @@
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
-%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
%{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}/classmap.db
# We usually do not multilib libjava
%if %{biarch_libjava}
@@ -1648,6 +1681,11 @@
%mainlib libgcj_bc.so.*
%endif
+%files -n libgcj@base_ver@-jar
+%defattr(-,root,root)
+%{_prefix}/share/java/libgcj-%{gcc_dir_version}.jar
+%{_prefix}/share/java/libgcj-tools-%{gcc_dir_version}.jar
+
%files -n libgcj@base_ver@-devel
%defattr(-,root,root)
%dir %{_prefix}/include/c++
@@ -1668,7 +1706,6 @@
%{gxxinclude}/org
%{gxxinclude}/sun
%{libsubdir}/include/gcj
-%{libsubdir}/ecj1
%if %{biarch_libjava}
%versbiarchlib libgcj.so
%versbiarchlib libgcj.spec
@@ -1685,33 +1722,27 @@
%files -n gcc@base_ver@-gij
%defattr(-,root,root)
-%{_prefix}/bin/gappletviewer%{binsuffix}
-%{_prefix}/bin/gjarsigner%{binsuffix}
-%{_prefix}/bin/gkeytool%{binsuffix}
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
-%{_prefix}/bin/grmid%{binsuffix}
-%{_prefix}/bin/jv-convert%{binsuffix}
-%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
+%{_prefix}/bin/gappletviewer%{binsuffix}
%{_prefix}/bin/gjar%{binsuffix}
-%{_prefix}/bin/gc-analyze%{binsuffix}
+%{_prefix}/bin/gjarsigner%{binsuffix}
%{_prefix}/bin/gjavah%{binsuffix}
+%{_prefix}/bin/gkeytool%{binsuffix}
%{_prefix}/bin/gnative2ascii%{binsuffix}
%{_prefix}/bin/gorbd%{binsuffix}
+%{_prefix}/bin/grmic%{binsuffix}
+%{_prefix}/bin/grmid%{binsuffix}
+%{_prefix}/bin/grmiregistry%{binsuffix}
%{_prefix}/bin/gserialver%{binsuffix}
%{_prefix}/bin/gtnameserv%{binsuffix}
-%{_prefix}/bin/gcjh%{binsuffix}
-%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
+%doc %{_mandir}/man1/gappletviewer%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmid%{binsuffix}.1.gz
%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/gkeytool%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjar%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjarsigner%{binsuffix}.1.gz
-%doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
%doc %{_mandir}/man1/gjavah%{binsuffix}.1.gz
%doc %{_mandir}/man1/gnative2ascii%{binsuffix}.1.gz
%doc %{_mandir}/man1/gorbd%{binsuffix}.1.gz
++++++ pr34148.diff -> pr33763.diff ++++++
--- gcc43/pr34148.diff 2007-11-22 15:45:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc43/pr33763.diff 2007-11-28 14:16:49.000000000 +0100
@@ -1,43 +1,19 @@
-2007-11-20 Richard Guenther
participants (1)
-
root@Hilbert.suse.de