Hello community, here is the log from the commit of package gnome-panel for openSUSE:Factory checked in at Mon Jul 11 16:45:53 CEST 2011. -------- --- GNOME/gnome-panel/gnome-panel.changes 2011-05-26 22:31:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2011-07-07 10:06:11.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 6 23:38:47 CEST 2011 - vuntz@opensuse.org + +- Create a branding-upstream subpackage, that contains the default + panel layout. +- Add gnome-panel-branding Requires to gnome-panel, to make sure a + default layout is installed. +- Fix license of subpackages: the non-library code is GPLv2+ and + the library code (including doc) is LGPLv2+, not LGPLv2.1+. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.S6YB2Z/_old 2011-07-11 16:44:54.000000000 +0200 +++ /var/tmp/diff_new_pack.S6YB2Z/_new 2011-07-11 16:44:54.000000000 +0200 @@ -19,9 +19,9 @@ Name: gnome-panel Version: 3.0.2 -Release: 1 +Release: 2 # FIXME: gnome-main-menu not ported to new panel API, for this reason we do not Recommend gnome-main-menu. -License: LGPLv2.1+ +License: GPLv2+ Summary: The GNOME Desktop Panel Url: http://www.gnome.org Group: System/GUI/GNOME @@ -72,6 +72,7 @@ BuildRequires: pkgconfig(telepathy-glib) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xau) +Requires: %{name}-branding = %{version} # Needed for the clock applet Requires: gnome-settings-daemon-polkit-datetime # Required by clock/tz.c: @@ -95,8 +96,29 @@ easy-to-use and functional interface to manage your desktop, start programs, and organize access to your data. +%package branding-upstream +License: GPLv2+ +Summary: The GNOME Desktop Panel -- Upstream default layout +Group: System/GUI/GNOME +Requires: %{name} = %{version} +Provides: %{name}-branding = %{version} +Conflicts: otherproviders(%{name}-branding) +Supplements: packageand(%{name}:branding-upstream) +BuildArch: noarch +#BRAND: Provides /usr/share/gnome-panel/panel-default-layout.layout +#BRAND: which contains the default layout. +#BRAND: Branding package should require packages with applets in +#BRAND: the default layout. + +%description branding-upstream +This package contains the GNOME Desktop Panel. The panel is an +easy-to-use and functional interface to manage your desktop, start +programs, and organize access to your data. + +This package contains the upstream default layout for GNOME Panel. + %package -n libpanel-applet-4-0 -License: LGPLv2.1+ +License: LGPLv2+ Summary: GNOME Panel Applet Library -- D-Bus-based library Group: System/GUI/GNOME @@ -127,7 +149,7 @@ This package contains extra panel applets such as Wanda the fish. %package devel -License: LGPLv2.1+ +License: LGPLv2+ Summary: GNOME Panel Applet Library -- Development Files Group: Development/Libraries/GNOME Requires: libpanel-applet-4-0 = %{version} @@ -144,7 +166,7 @@ to develop applications that require these. %package doc -License: LGPLv2.1+ +License: LGPLv2+ Summary: GNOME Panel Applet Library -- Developer Documentation Group: System/GUI/GNOME Requires: %{name} = %{version} @@ -276,13 +298,19 @@ %exclude %{_datadir}/gnome-panel/pixmaps/oldwanda.png %exclude %{_datadir}/gnome-panel/ui/fish.ui %exclude %{_datadir}/gnome-panel/ui/fish-menu.xml +%exclude %{_datadir}/gnome-panel/panel-default-layout.layout %exclude %{_datadir}/icons/hicolor/*/apps/gnome-panel-fish.* %exclude %{_libdir}/gnome-panel/4.0/libfish-applet.so # Files that are in the devel package %exclude %{_datadir}/gnome-panel/ui/panel-test-applets.ui +%files branding-upstream +%defattr (-, root, root) +%{_datadir}/gnome-panel/panel-default-layout.layout + %files -n libpanel-applet-4-0 %defattr (-, root, root) +%doc COPYING.LIB # applets using this library must install a file in %%{_datadir}/gnome-panel/applets %dir %{_datadir}/gnome-panel/ %dir %{_datadir}/gnome-panel/4.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org