Hello community, here is the log from the commit of package gnome-menus-branding-openSUSE checked in at Mon Oct 6 18:03:25 CEST 2008. -------- --- GNOME/gnome-menus-branding-openSUSE/gnome-menus-branding-openSUSE.changes 2008-07-31 17:02:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-openSUSE/gnome-menus-branding-openSUSE.changes 2008-10-06 16:31:56.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 6 16:31:52 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback GNOME/gnome-menus-branding-openSUSE Destination is GNOME/gnome-menus-branding-openSUSE calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.E25878/_old 2008-10-06 18:02:46.000000000 +0200 +++ /var/tmp/diff_new_pack.E25878/_new 2008-10-06 18:02:46.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package gnome-menus-branding-openSUSE (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: gnome-menus-branding-openSUSE Version: 11.1 -Release: 2 +Release: 32 Group: System/GUI/GNOME License: BSD 3-Clause Summary: openSUSE branding of gnome-menus @@ -22,6 +29,7 @@ Source2: %{name}-Hidden.directory Patch: %{name}-customization.patch Provides: gnome-menus-branding = 2.23 +Conflicts: otherproviders(gnome-menus-branding) Supplements: packageand(branding-openSUSE:gnome-menus) BuildRoot: %{_tmppath}/%{name}-%{version}-build # To be in sync with upstream defaults, do branding as a patch for upstream file. @@ -66,6 +74,9 @@ %doc COPYING %{_datadir}/desktop-directories/*.directory %{_sysconfdir}/xdg/menus/*.menu + %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Thu Jul 31 2008 sbrabec@suse.cz - New SuSE package (fate#303889). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org