Mailinglist Archive: opensuse-commit (1943 mails)
| < Previous | Next > |
commit gcc33
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 04 Nov 2008 17:35:39 +0100
- Message-id: <20081104163539.653276780AA@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gcc33
checked in at Tue Nov 4 17:35:39 CET 2008.
--------
--- gcc33/gcc33.changes 2008-10-28 18:53:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/gcc33/gcc33.changes 2008-11-04
17:25:11.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 4 10:47:14 CET 2008 - rguenther@xxxxxxx
+
+- Fix libgcj33 build, only build the testresults package there.
+
+-------------------------------------------------------------------
libgcj33.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gcc33.spec ++++++
--- /var/tmp/diff_new_pack.BV8459/_old 2008-11-04 17:34:41.000000000 +0100
+++ /var/tmp/diff_new_pack.BV8459/_new 2008-11-04 17:34:41.000000000 +0100
@@ -36,7 +36,8 @@
%define build_libjava 0
%else
%define build_java 1
-%define build_libjava 0%{?building_libjava:1}
+#%define build_libjava 0%{?building_libjava:1}
+%define build_libjava 0
%endif
%define build_fortran 1
%define build_objcp 0
@@ -111,7 +112,7 @@
Url: http://gcc.gnu.org/
License: GPL v2 or later
Version: 3.3.3
-Release: 4
+Release: 5
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed
's/_/-/')
%define binsuffix -3.3
@@ -1363,13 +1364,16 @@
export _POSIX2_VERSION=199209
export
LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi32}:$RPM_BUILD_ROOT%{mainlibdirbi64}
%if 0%{?building_libjava:1}
+%if %{build_libjava}
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
+%endif
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
%else
make install DESTDIR=$RPM_BUILD_ROOT
%endif
mkdir -p $RPM_BUILD_ROOT%{_libdir}
+%if 0%{?!building_libjava:1}
# Move wrongly installed fortran stuff
mv $RPM_BUILD_ROOT%{libsubdir}/../lib* $RPM_BUILD_ROOT%{libsubdir}/
%if %{biarch}
@@ -1379,9 +1383,12 @@
mv $RPM_BUILD_ROOT%{libsubdir}/../64/lib* $RPM_BUILD_ROOT%{libsubdir}/64/
%endif
%endif
+%endif
# Move manpages that were not properly versioned
+%if 0%{?!building_libjava:1}
mv $RPM_BUILD_ROOT%{_mandir}/man1/gcov.1
$RPM_BUILD_ROOT%{_mandir}/man1/gcov%{binsuffix}.1
mv $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1
$RPM_BUILD_ROOT%{_mandir}/man1/cpp%{binsuffix}.1
+%endif
%if %{build_java}
for i in gcjh gij jcf-dump jv-convert jv-scan rmic rmiregistry; do
mv $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
$RPM_BUILD_ROOT%{_mandir}/man1/$i%{binsuffix}.1
@@ -1570,10 +1577,12 @@
cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' `
../testresults/
%endif
# Find C++ and Java headers
+if test -d $RPM_BUILD_ROOT%{_prefix}/include/c++; then
find $RPM_BUILD_ROOT%{_prefix}/include/c++ \
-regex ".*/\(org\|gcj\|gnu\|java\|javax\)" -prune \
-o \( -type d -printf "%%%%dir " , \
-printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers
+fi
# Remove files that we do not need to clean up filelist
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-*
rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools
@@ -1609,8 +1618,12 @@
%if !%{build_libjava}
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmiregistry%{binsuffix}.1
+%if 0%{?building_libjava:1}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmic%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmiregistry%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
+%endif
%endif
# fastjar is separate now
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/fastjar%{binsuffix}
@@ -1635,10 +1648,10 @@
%endif
# For building libjava only we need to delete other manpages
%if 0%{?building_libjava:1}
-rm $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
%endif
# Delete some files...
%if %{versionspecificlibs}
@@ -2048,15 +2061,15 @@
%files -n gcc33-gij
%defattr(-,root,root)
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
+%{_prefix}/bin/rmic%{binsuffix}
+%{_prefix}/bin/rmiregistry%{binsuffix}
%{_prefix}/bin/jv-convert%{binsuffix}
%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmic%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
%files -n libffi33
@@ -2095,6 +2108,8 @@
%endif
%changelog
+* Tue Nov 04 2008 rguenther@xxxxxxx
+- Fix libgcj33 build, only build the testresults package there.
* Tue Oct 28 2008 matz@xxxxxxx
- Work-around rpm problem with commented file section parts.
* Mon Oct 27 2008 matz@xxxxxxx
++++++ libgcj33.spec ++++++
--- /var/tmp/diff_new_pack.BV8459/_old 2008-11-04 17:34:41.000000000 +0100
+++ /var/tmp/diff_new_pack.BV8459/_new 2008-11-04 17:34:41.000000000 +0100
@@ -47,7 +47,8 @@
%define build_libjava 0
%else
%define build_java 1
-%define build_libjava 0%{?building_libjava:1}
+#%define build_libjava 0%{?building_libjava:1}
+%define build_libjava 0
%endif
%define build_fortran 1
%define build_objcp 0
@@ -122,7 +123,7 @@
Url: http://gcc.gnu.org/
License: GPL v2 or later; LGPL v2.1 or later
Version: 3.3.3
-Release: 4
+Release: 5
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed
's/_/-/')
%define binsuffix -3.3
@@ -719,13 +720,16 @@
export _POSIX2_VERSION=199209
export
LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi32}:$RPM_BUILD_ROOT%{mainlibdirbi64}
%if 0%{?building_libjava:1}
+%if %{build_libjava}
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
+%endif
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
%else
make install DESTDIR=$RPM_BUILD_ROOT
%endif
mkdir -p $RPM_BUILD_ROOT%{_libdir}
+%if 0%{?!building_libjava:1}
# Move wrongly installed fortran stuff
mv $RPM_BUILD_ROOT%{libsubdir}/../lib* $RPM_BUILD_ROOT%{libsubdir}/
%if %{biarch}
@@ -735,9 +739,12 @@
mv $RPM_BUILD_ROOT%{libsubdir}/../64/lib* $RPM_BUILD_ROOT%{libsubdir}/64/
%endif
%endif
+%endif
# Move manpages that were not properly versioned
+%if 0%{?!building_libjava:1}
mv $RPM_BUILD_ROOT%{_mandir}/man1/gcov.1
$RPM_BUILD_ROOT%{_mandir}/man1/gcov%{binsuffix}.1
mv $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1
$RPM_BUILD_ROOT%{_mandir}/man1/cpp%{binsuffix}.1
+%endif
%if %{build_java}
for i in gcjh gij jcf-dump jv-convert jv-scan rmic rmiregistry; do
mv $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
$RPM_BUILD_ROOT%{_mandir}/man1/$i%{binsuffix}.1
@@ -843,10 +850,12 @@
cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' `
../testresults/
%endif
# Find C++ and Java headers
+if test -d $RPM_BUILD_ROOT%{_prefix}/include/c++; then
find $RPM_BUILD_ROOT%{_prefix}/include/c++ \
-regex ".*/\(org\|gcj\|gnu\|java\|javax\)" -prune \
-o \( -type d -printf "%%%%dir " , \
-printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers
+fi
# Remove files that we do not need to clean up filelist
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-*
rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools
@@ -882,8 +891,12 @@
%if !%{build_libjava}
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmiregistry%{binsuffix}.1
+%if 0%{?building_libjava:1}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmic%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmiregistry%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
+%endif
%endif
# fastjar is separate now
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/fastjar%{binsuffix}
@@ -908,10 +921,10 @@
%endif
# For building libjava only we need to delete other manpages
%if 0%{?building_libjava:1}
-rm $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
%endif
# Delete some files...
%if %{versionspecificlibs}
@@ -993,15 +1006,15 @@
%files -n gcc33-gij
%defattr(-,root,root)
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
+%{_prefix}/bin/rmic%{binsuffix}
+%{_prefix}/bin/rmiregistry%{binsuffix}
%{_prefix}/bin/jv-convert%{binsuffix}
%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmic%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
%files -n libffi33
@@ -1040,6 +1053,8 @@
%endif
%changelog
+* Tue Nov 04 2008 rguenther@xxxxxxx
+- Fix libgcj33 build, only build the testresults package there.
* Tue Oct 28 2008 matz@xxxxxxx
- Work-around rpm problem with commented file section parts.
* Mon Oct 27 2008 matz@xxxxxxx
++++++ gcc.spec.in ++++++
--- /var/tmp/diff_new_pack.BV8459/_old 2008-11-04 17:34:42.000000000 +0100
+++ /var/tmp/diff_new_pack.BV8459/_new 2008-11-04 17:34:42.000000000 +0100
@@ -33,7 +33,8 @@
%define build_libjava 0
%else
%define build_java 1
-%define build_libjava 0%{?building_libjava:1}
+#%define build_libjava 0%{?building_libjava:1}
+%define build_libjava 0
%endif
%define build_fortran 1
@@ -974,14 +975,17 @@
export _POSIX2_VERSION=199209
export
LIBRARY_PATH=$RPM_BUILD_ROOT%{libsubdir}:$RPM_BUILD_ROOT%{mainlibdirbi32}:$RPM_BUILD_ROOT%{mainlibdirbi64}
%if 0%{?building_libjava:1}
+%if %{build_libjava}
make -C %{GCCDIST}/libjava install DESTDIR=$RPM_BUILD_ROOT
make -C %{GCCDIST}/libffi install DESTDIR=$RPM_BUILD_ROOT
+%endif
make -C gcc java.install-man DESTDIR=$RPM_BUILD_ROOT
%else
make install DESTDIR=$RPM_BUILD_ROOT
%endif
mkdir -p $RPM_BUILD_ROOT%{_libdir}
+%if 0%{?!building_libjava:1}
# Move wrongly installed fortran stuff
mv $RPM_BUILD_ROOT%{libsubdir}/../lib* $RPM_BUILD_ROOT%{libsubdir}/
%if %{biarch}
@@ -991,10 +995,13 @@
mv $RPM_BUILD_ROOT%{libsubdir}/../64/lib* $RPM_BUILD_ROOT%{libsubdir}/64/
%endif
%endif
+%endif
# Move manpages that were not properly versioned
+%if 0%{?!building_libjava:1}
mv $RPM_BUILD_ROOT%{_mandir}/man1/gcov.1
$RPM_BUILD_ROOT%{_mandir}/man1/gcov%{binsuffix}.1
mv $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1
$RPM_BUILD_ROOT%{_mandir}/man1/cpp%{binsuffix}.1
+%endif
%if %{build_java}
for i in gcjh gij jcf-dump jv-convert jv-scan rmic rmiregistry; do
mv $RPM_BUILD_ROOT%{_mandir}/man1/$i.1
$RPM_BUILD_ROOT%{_mandir}/man1/$i%{binsuffix}.1
@@ -1194,10 +1201,12 @@
cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' `
../testresults/
%endif
# Find C++ and Java headers
+if test -d $RPM_BUILD_ROOT%{_prefix}/include/c++; then
find $RPM_BUILD_ROOT%{_prefix}/include/c++ \
-regex ".*/\(org\|gcj\|gnu\|java\|javax\)" -prune \
-o \( -type d -printf "%%%%dir " , \
-printf "%{_prefix}/include/c++/%%P\n" \) > ../c++-headers
+fi
# Remove files that we do not need to clean up filelist
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{GCCDIST}-*
rm -rf $RPM_BUILD_ROOT%{libsubdir}/install-tools
@@ -1235,8 +1244,12 @@
%if !%{build_libjava}
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj-dbtool%{binsuffix}.1
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gij%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmic%{binsuffix}.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/grmiregistry%{binsuffix}.1
+%if 0%{?building_libjava:1}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmic%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/rmiregistry%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jcf-dump%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-convert%{binsuffix}.1
+%endif
%endif
# fastjar is separate now
rm -f $RPM_BUILD_ROOT%{_prefix}/bin/fastjar%{binsuffix}
@@ -1262,10 +1275,10 @@
# For building libjava only we need to delete other manpages
%if 0%{?building_libjava:1}
-rm $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
-rm $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_prefix}/bin/addr2name.awk%{binsuffix}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcj%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gcjh%{binsuffix}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/jv-scan%{binsuffix}.1
%endif
# Delete some files...
@@ -1681,15 +1694,15 @@
%files -n gcc@base_ver@-gij
%defattr(-,root,root)
-%{_prefix}/bin/grmic%{binsuffix}
-%{_prefix}/bin/grmiregistry%{binsuffix}
+%{_prefix}/bin/rmic%{binsuffix}
+%{_prefix}/bin/rmiregistry%{binsuffix}
%{_prefix}/bin/jv-convert%{binsuffix}
%{_prefix}/bin/gcj-dbtool%{binsuffix}
%{_prefix}/bin/gij%{binsuffix}
%doc %{_mandir}/man1/gij%{binsuffix}.1.gz
%doc %{_mandir}/man1/gcj-dbtool%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmic%{binsuffix}.1.gz
-%doc %{_mandir}/man1/grmiregistry%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmic%{binsuffix}.1.gz
+%doc %{_mandir}/man1/rmiregistry%{binsuffix}.1.gz
%doc %{_mandir}/man1/jv-convert%{binsuffix}.1.gz
%files -n libffi@base_ver@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |