Hello community, here is the log from the commit of package gnome-menus-branding-openSUSE for openSUSE:Factory checked in at Mon Jul 25 10:46:00 CEST 2011. -------- --- GNOME/gnome-menus-branding-openSUSE/gnome-menus-branding-openSUSE.changes 2011-07-07 10:14:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-branding-openSUSE/gnome-menus-branding-openSUSE.changes 2011-07-22 13:24:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 22 13:18:09 CEST 2011 - vuntz@opensuse.org + +- Drop gnome-menus-branding-settings.menu source: we do not install + a settings.menu file, since upstream doesn't ship one either. + Fix bnc#703818. + +------------------------------------------------------------------- gnome-menus-branding-SLED.changes: same change calling whatdependson for head-i586 Old: ---- gnome-menus-branding-settings.menu ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.S7LymR/_old 2011-07-25 10:28:21.000000000 +0200 +++ /var/tmp/diff_new_pack.S7LymR/_new 2011-07-25 10:28:21.000000000 +0200 @@ -23,13 +23,12 @@ Name: gnome-menus-branding-openSUSE Version: 12.1 -Release: 1 +Release: 3 Group: System/GUI/GNOME License: LGPLv2.1+ Summary: The GNOME Desktop Menu -- openSUSE Menus Definitions Url: http://www.gnome.org Source: gnome-menus-branding-COPYING -Source1: gnome-menus-branding-settings.menu # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. @@ -58,9 +57,6 @@ cp -a %{S:0} COPYING # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . -# Override settings.menu with our version. It doesn't make sense to patch it, -# they're just completely different -cp -a %{S:1} settings.menu %patch0 -p0 %build @@ -76,6 +72,5 @@ %defattr (-, root, root) %doc COPYING %{_sysconfdir}/xdg/menus/gnome-applications.menu -%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++ gnome-menus-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.S7LymR/_old 2011-07-25 10:28:21.000000000 +0200 +++ /var/tmp/diff_new_pack.S7LymR/_new 2011-07-25 10:28:21.000000000 +0200 @@ -23,13 +23,12 @@ Name: gnome-menus-branding-SLED Version: 12.1 -Release: 1 +Release: 2 Group: System/GUI/GNOME License: LGPLv2.1+ Summary: The GNOME Desktop Menu -- SLED Menus Definitions Url: http://www.gnome.org Source: gnome-menus-branding-COPYING -Source1: gnome-menus-branding-settings.menu # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. @@ -58,9 +57,6 @@ cp -a %{S:0} COPYING # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . -# Override settings.menu with our version. It doesn't make sense to patch it, -# they're just completely different -cp -a %{S:1} settings.menu %patch0 -p0 %build @@ -76,6 +72,5 @@ %defattr (-, root, root) %doc COPYING %{_sysconfdir}/xdg/menus/gnome-applications.menu -%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++ gnome-menus-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.S7LymR/_old 2011-07-25 10:28:21.000000000 +0200 +++ /var/tmp/diff_new_pack.S7LymR/_new 2011-07-25 10:28:21.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 22 13:18:09 CEST 2011 - vuntz@opensuse.org + +- Drop gnome-menus-branding-settings.menu source: we do not install + a settings.menu file, since upstream doesn't ship one either. + Fix bnc#703818. + +------------------------------------------------------------------- Thu Jul 7 10:13:17 CEST 2011 - vuntz@opensuse.org - Change License tag from BSD3c to LGPLv2.1+: since we base our ++++++ gnome-menus-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.S7LymR/_old 2011-07-25 10:28:21.000000000 +0200 +++ /var/tmp/diff_new_pack.S7LymR/_new 2011-07-25 10:28:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-menus-branding-%{branding_name} # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,7 +27,6 @@ Summary: The GNOME Desktop Menu -- %{branding_name} Menus Definitions Url: http://www.gnome.org Source: gnome-menus-branding-COPYING -Source1: gnome-menus-branding-settings.menu # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch vuntz@opensuse.org -- Remove the desktop files with X-SuSE-YaST category from the Applications menu and explicitly add YaST launcher Patch0: gnome-menus-branding-remove-X-SuSE-ControlCenter.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. @@ -56,9 +55,6 @@ cp -a %{S:0} COPYING # We will base menus on upstream menus: cp -a %{_sysconfdir}/xdg/menus/*.menu . -# Override settings.menu with our version. It doesn't make sense to patch it, -# they're just completely different -cp -a %{S:1} settings.menu %patch0 -p0 %build @@ -74,6 +70,5 @@ %defattr (-, root, root) %doc COPYING %{_sysconfdir}/xdg/menus/gnome-applications.menu -%{_sysconfdir}/xdg/menus/settings.menu %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org