Hello community, here is the log from the commit of package gcc33 for openSUSE:Factory checked in at 2013-06-06 14:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc33 (Old) and /work/SRC/openSUSE:Factory/.gcc33.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc33" Changes: -------- --- /work/SRC/openSUSE:Factory/gcc33/gcc33.changes 2012-09-11 13:57:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc33.new/gcc33.changes 2013-06-06 14:52:32.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 6 08:02:45 UTC 2013 - [email protected] + +- Do not package info docs which conflict with the generic + gcc-info package from recent releases. + +------------------------------------------------------------------- +Fri Apr 12 10:09:12 UTC 2013 - [email protected] + +- Do not package libstdc++ locale which conflicts with the locale + from the libstdc++6 package. + +------------------------------------------------------------------- libgcj33.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcc33.spec ++++++ --- /var/tmp/diff_new_pack.vMn8q6/_old 2013-06-06 14:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.vMn8q6/_new 2013-06-06 14:52:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gcc33 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -1649,6 +1649,14 @@ rm $RPM_BUILD_ROOT%{_infodir}/*.info* rm $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/*.mo %endif +# ??? The libstdc++5 locale conflicts with the libstdc++6 locale. +# prefer the libstdc++6 one by simply removing ours +rm -f $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo + +# Do not package gcc-info as that conflicts with later gcc +%if %{suse_version} >= 1010 +rm -f $RPM_BUILD_ROOT%{_infodir}/*.info* +%endif # LIBJAVA-DELETE-BEGIN %post info @@ -1753,10 +1761,6 @@ %files locale %defattr(-,root,root) %{_prefix}/share/locale/*/LC_MESSAGES/gcc.mo -# FIXME - maybe this should go into a new package libstdc++-locale -%if 0%{!?build_for_base:1} -%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo -%endif %endif %files c++ @@ -1873,6 +1877,7 @@ %endif %endif +%if %{suse_version} < 1010 %if !%{versionspecificlibs} %files info %defattr(-,root,root) @@ -1892,6 +1897,7 @@ %doc %{_infodir}/gnat_ugn_unw.info*gz %endif %endif +%endif %files -n cpp33 %defattr(-,root,root) ++++++ libgcj33.spec ++++++ --- /var/tmp/diff_new_pack.vMn8q6/_old 2013-06-06 14:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.vMn8q6/_new 2013-06-06 14:52:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgcj33 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -992,6 +992,14 @@ rm $RPM_BUILD_ROOT%{_infodir}/*.info* rm $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/*.mo %endif +# ??? The libstdc++5 locale conflicts with the libstdc++6 locale. +# prefer the libstdc++6 one by simply removing ours +rm -f $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo + +# Do not package gcc-info as that conflicts with later gcc +%if %{suse_version} >= 1010 +rm -f $RPM_BUILD_ROOT%{_infodir}/*.info* +%endif %if %{build_java} %if %{build_libjava} ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.vMn8q6/_old 2013-06-06 14:52:34.000000000 +0200 +++ /var/tmp/diff_new_pack.vMn8q6/_new 2013-06-06 14:52:34.000000000 +0200 @@ -1304,6 +1304,14 @@ rm $RPM_BUILD_ROOT%{_infodir}/*.info* rm $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/*.mo %endif +# ??? The libstdc++5 locale conflicts with the libstdc++6 locale. +# prefer the libstdc++6 one by simply removing ours +rm -f $RPM_BUILD_ROOT%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo + +# Do not package gcc-info as that conflicts with later gcc +%if %{suse_version} >= 1010 +rm -f $RPM_BUILD_ROOT%{_infodir}/*.info* +%endif # LIBJAVA-DELETE-BEGIN %post info @@ -1409,10 +1417,6 @@ %files locale %defattr(-,root,root) %{_prefix}/share/locale/*/LC_MESSAGES/gcc.mo -# FIXME - maybe this should go into a new package libstdc++-locale -%if 0%{!?build_for_base:1} -%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo -%endif %endif %files c++ @@ -1530,6 +1534,7 @@ %endif %endif +%if %{suse_version} < 1010 %if !%{versionspecificlibs} %files info %defattr(-,root,root) @@ -1549,6 +1554,7 @@ %doc %{_infodir}/gnat_ugn_unw.info*gz %endif %endif +%endif %files -n cpp@base_ver@ %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
