Hello community, here is the log from the commit of package gcc checked in at Fri Nov 30 16:11:47 CET 2007. -------- --- gcc/gcc.changes 2007-11-16 16:17:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc/gcc.changes 2007-11-29 12:12:24.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 23 14:53:40 CET 2007 - rguenther@suse.de + +- Make gcc-gij dependency of gcc-java a recommendation, all java + tools are back to the gcc-java package. Require libgcj-devel + from gcc-java. +- Revert /lib/cpp changes. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc.spec ++++++ --- /var/tmp/diff_new_pack.Q15147/_old 2007-11-30 16:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Q15147/_new 2007-11-30 16:11:31.000000000 +0100 @@ -24,7 +24,7 @@ %define gcc_suffix 4.3 License: GPL v2 or later Version: 4.3 -Release: 6 +Release: 9 Group: Development/Languages/C and C++ Summary: The system GNU C Compiler Provides: c_compiler @@ -192,7 +192,8 @@ Group: Development/Languages/Java Summary: The system GNU Java Compiler Requires: gcc%{gcc_version}-java -Requires: gcc%{gcc_version}-gij +Requires: libgcj-devel +Recommends: gcc-gij Requires: gcc %description -n gcc-java @@ -352,13 +353,13 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-objc/ mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/doc/packages/gcc-obj-c++/ # Link all the binaries -# XXX gjavah +# - do not link binaries that conflict with classpath for now for program in \ gcc gcov \ g++ \ cpp \ - gcj jcf-dump \ - gc-analyze gcj-dbtool gcjh gij jv-convert \ + gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \ + gij \ %if 0 gappletviewer \ gjar gjarsigner gjavah gkeytool gnative2ascii gorbd grmic \ @@ -383,13 +384,14 @@ ln -sf $program-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/$program done # Link section 1 manpages -# XXX gjavah +# - do not link manpages that conflict with classpath for now for man1 in \ gcc gcov \ g++ \ cpp \ gfortran \ - gcj jcf-dump gc-analyze gcj-dbtool gij \ + gcj gcjh gcj-dbtool jcf-dump jv-convert gc-analyze \ + gij \ %if 0 gappletviewer gjar gjarsigner gjavah \ gkeytool gnative2ascii gorbd grmic grmid grmiregistry gserialver \ @@ -437,17 +439,21 @@ %files -n gcc-java %defattr(-,root,root) %{_prefix}/bin/gcj +%{_prefix}/bin/gcjh +%{_prefix}/bin/gcj-dbtool %{_prefix}/bin/jcf-dump +%{_prefix}/bin/jv-convert +%{_prefix}/bin/gc-analyze %doc %{_mandir}/man1/gcj.1.gz +%doc %{_mandir}/man1/gcjh.1.gz +%doc %{_mandir}/man1/gcj-dbtool.1.gz %doc %{_mandir}/man1/jcf-dump.1.gz +%doc %{_mandir}/man1/jv-convert.1.gz +%doc %{_mandir}/man1/gc-analyze.1.gz %files -n gcc-gij %defattr(-,root,root) -%{_prefix}/bin/gc-analyze -%{_prefix}/bin/gcj-dbtool -%{_prefix}/bin/gcjh %{_prefix}/bin/gij -%{_prefix}/bin/jv-convert %if 0 %{_prefix}/bin/gappletviewer %{_prefix}/bin/gjar @@ -462,8 +468,6 @@ %{_prefix}/bin/gserialver %{_prefix}/bin/gtnameserv %endif -%doc %{_mandir}/man1/gc-analyze.1.gz -%doc %{_mandir}/man1/gcj-dbtool.1.gz %doc %{_mandir}/man1/gij.1.gz %if 0 %doc %{_mandir}/man1/gappletviewer.1.gz @@ -591,6 +595,11 @@ %endif %changelog +* Fri Nov 23 2007 - rguenther@suse.de +- Make gcc-gij dependency of gcc-java a recommendation, all java + tools are back to the gcc-java package. Require libgcj-devel + from gcc-java. +- Revert /lib/cpp changes. * Fri Nov 16 2007 - rguenther@suse.de - For now disable symlinking of binaries and manpages that conflict with the classpath package. ++++++ cpp ++++++ --- gcc/cpp 2007-11-13 14:37:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/gcc/cpp 2007-11-29 12:12:07.000000000 +0100 @@ -1,4 +1,3 @@ #!/bin/sh # Traditionally, /lib/cpp only knew about C. -# Also supress GCC and target specific defines and be more permissive. -exec /usr/bin/cpp -xc -traditional-cpp -undef "$@" +exec /usr/bin/cpp -xc "$@" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org