Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Mon Feb 7 23:55:28 CET 2011. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-01-26 18:35:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-02-04 19:59:27.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 28 16:56:18 UTC 2011 - gber@opensuse.org + +- Add gnome-panel-branding-* dummy package, which requires tomboy + in order to avoid it as a direct dependency of gconf2-branding-*. + This fixes bnc#531836. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.9jXOWx/_old 2011-02-07 23:55:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9jXOWx/_new 2011-02-07 23:55:01.000000000 +0100 @@ -69,7 +69,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 4 +Release: 5 Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries @@ -99,6 +99,8 @@ BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) +BuildRequires: gnome-panel +%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gnome-session:branding-SLED) @@ -122,11 +124,6 @@ # Sound theme Requires: novell-sound-theme %endif -%if ! %build_SLES -# tomboy is in the default panel configuration -# FIXME: this should be a Requires, but see bnc#531836 -Recommends: tomboy -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -177,6 +174,24 @@ This packages provides the default sound theme by Novell. %endif +%if ! %build_SLES + +%package -n gnome-panel-branding-SLED +License: BSD3c(or similar) +Summary: SLED branding of gnome-panel +Group: System/GUI/GNOME +Requires: tomboy +Provides: gnome-panel-branding = %{gnome_panel_version} +Conflicts: otherproviders(gnome-panel-branding) +Supplements: packageand(gnome-panel:branding-SLED) +Supplements: packageand(gnome-panel:gconf2-branding-SLED) +BuildArch: noarch + +%description -n gnome-panel-branding-SLED +This package provides SLED Look and Feel for the GNOME +panel. +%endif + %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} @@ -434,4 +449,11 @@ %{_datadir}/sounds/novell/ %endif +%if ! %build_SLES + +%files -n gnome-panel-branding-SLED +%defattr(-,root,root) +%doc COPYING +%endif + %changelog ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.9jXOWx/_old 2011-02-07 23:55:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9jXOWx/_new 2011-02-07 23:55:01.000000000 +0100 @@ -69,7 +69,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 4 +Release: 5 Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries @@ -99,6 +99,8 @@ BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) +BuildRequires: gnome-panel +%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gnome-session:branding-SLES) @@ -122,11 +124,6 @@ # Sound theme Requires: novell-sound-theme %endif -%if ! %build_SLES -# tomboy is in the default panel configuration -# FIXME: this should be a Requires, but see bnc#531836 -Recommends: tomboy -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -177,6 +174,24 @@ This packages provides the default sound theme by Novell. %endif +%if ! %build_SLES + +%package -n gnome-panel-branding-SLES +License: BSD3c(or similar) +Summary: SLES branding of gnome-panel +Group: System/GUI/GNOME +Requires: tomboy +Provides: gnome-panel-branding = %{gnome_panel_version} +Conflicts: otherproviders(gnome-panel-branding) +Supplements: packageand(gnome-panel:branding-SLES) +Supplements: packageand(gnome-panel:gconf2-branding-SLES) +BuildArch: noarch + +%description -n gnome-panel-branding-SLES +This package provides SLES Look and Feel for the GNOME +panel. +%endif + %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} @@ -434,4 +449,11 @@ %{_datadir}/sounds/novell/ %endif +%if ! %build_SLES + +%files -n gnome-panel-branding-SLES +%defattr(-,root,root) +%doc COPYING +%endif + %changelog ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.9jXOWx/_old 2011-02-07 23:55:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9jXOWx/_new 2011-02-07 23:55:01.000000000 +0100 @@ -69,7 +69,7 @@ Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 3 +Release: 4 Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries @@ -99,6 +99,8 @@ BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) +BuildRequires: gnome-panel +%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gnome-session:branding-openSUSE) @@ -122,11 +124,6 @@ # Sound theme Requires: novell-sound-theme %endif -%if ! %build_SLES -# tomboy is in the default panel configuration -# FIXME: this should be a Requires, but see bnc#531836 -Recommends: tomboy -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -177,6 +174,24 @@ This packages provides the default sound theme by Novell. %endif +%if ! %build_SLES + +%package -n gnome-panel-branding-openSUSE +License: BSD3c(or similar) +Summary: openSUSE branding of gnome-panel +Group: System/GUI/GNOME +Requires: tomboy +Provides: gnome-panel-branding = %{gnome_panel_version} +Conflicts: otherproviders(gnome-panel-branding) +Supplements: packageand(gnome-panel:branding-openSUSE) +Supplements: packageand(gnome-panel:gconf2-branding-openSUSE) +BuildArch: noarch + +%description -n gnome-panel-branding-openSUSE +This package provides openSUSE Look and Feel for the GNOME +panel. +%endif + %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} @@ -434,4 +449,11 @@ %{_datadir}/sounds/novell/ %endif +%if ! %build_SLES + +%files -n gnome-panel-branding-openSUSE +%defattr(-,root,root) +%doc COPYING +%endif + %changelog ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.9jXOWx/_old 2011-02-07 23:55:01.000000000 +0100 +++ /var/tmp/diff_new_pack.9jXOWx/_new 2011-02-07 23:55:01.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 28 16:56:18 UTC 2011 - gber@opensuse.org + +- Add gnome-panel-branding-* dummy package, which requires tomboy + in order to avoid it as a direct dependency of gconf2-branding-*. + This fixes bnc#531836. + +------------------------------------------------------------------- Wed Jan 26 18:34:04 CET 2011 - vuntz@opensuse.org - Revert the previous change: some apps might still check the gconf ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.9jXOWx/_old 2011-02-07 23:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.9jXOWx/_new 2011-02-07 23:55:02.000000000 +0100 @@ -97,6 +97,8 @@ BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) +BuildRequires: gnome-panel +%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gnome-session:branding-%{branding_name}) @@ -120,11 +122,6 @@ # Sound theme Requires: novell-sound-theme %endif -%if ! %build_SLES -# tomboy is in the default panel configuration -# FIXME: this should be a Requires, but see bnc#531836 -Recommends: tomboy -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -173,6 +170,23 @@ This packages provides the default sound theme by Novell. %endif +%if ! %build_SLES +%package -n gnome-panel-branding-%{branding_name} +License: BSD3c(or similar) +Summary: %{branding_name} branding of gnome-panel +Group: System/GUI/GNOME +Requires: tomboy +Provides: gnome-panel-branding = %{gnome_panel_version} +Conflicts: otherproviders(gnome-panel-branding) +Supplements: packageand(gnome-panel:branding-%{branding_name}) +Supplements: packageand(gnome-panel:gconf2-branding-%{branding_name}) +BuildArch: noarch + +%description -n gnome-panel-branding-%{branding_name} +This package provides %{branding_name} Look and Feel for the GNOME +panel. +%endif + %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} @@ -428,4 +442,10 @@ %{_datadir}/sounds/novell/ %endif +%if ! %build_SLES +%files -n gnome-panel-branding-%{branding_name} +%defattr(-,root,root) +%doc COPYING +%endif + %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org