Hello community, here is the log from the commit of package gnome-menus-legacy for openSUSE:Factory checked in at Mon Sep 12 11:03:31 CEST 2011.
-------- --- gnome-menus-legacy/gnome-menus-legacy.changes 2011-08-19 09:42:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-menus-legacy/gnome-menus-legacy.changes 2011-09-02 01:46:08.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Sep 1 23:44:44 UTC 2011 - [email protected] + +- Do not ship gnome-menus-ls.py as it is GPL-2.0+, while everything + else we ship is now LGPL-2.1+. Since we do not want to encourage + people to use the legacy library, there is no need to ship this + example. Fix bnc#714929. + +------------------------------------------------------------------- +Tue Aug 30 11:04:54 CEST 2011 - [email protected] + +- Drop subpackages that provide files coming with the non-legacy + package: + + main subpackage: the .directory files are in gnome-menus. Also + remove Requires and Recommends used for it. + + branding-upstream: we don't need branding for the legacy code. + + editor: we have the same editor in the new package. Also remove + %post/%postun. +- Drop lang subpackage: translations are only there for the editor. +- Remove fdupes, translation-update-upstream and + update-desktop-files BuildRequires usage as there is no duplicate + file, nor translations, nor .desktop/.directory files anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus-legacy.spec ++++++ --- /var/tmp/diff_new_pack.RJkfcA/_old 2011-09-12 11:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.RJkfcA/_new 2011-09-12 11:03:27.000000000 +0200 @@ -20,7 +20,7 @@ Name: gnome-menus-legacy %define _name gnome-menus Version: 3.0.1 -Release: 6 +Release: 8 License: LGPLv2.1+ Summary: The GNOME Desktop Menu - Legacy compatibility version Url: http://www.gnome.org @@ -29,19 +29,14 @@ Source99: baselibs.conf # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch3: gnome-menus-x-suse-unimportant.patch -BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: python-devel BuildRequires: python-gtk -BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common %endif -Requires: %{name}-branding = %{version} -Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,32 +68,6 @@ This package is provided for backwards compatibility only and is likely to disappear soon. -%package branding-upstream -License: LGPLv2.1+ -Summary: The GNOME Desktop Menu -- Upstream Menus Definitions -Group: System/GUI/GNOME -Requires: %{name} = %{version} -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(%{name}-branding) -Supplements: packageand(%{name}:branding-upstream) -BuildArch: noarch -#BRAND: This package contains set of needed .menu files in -#BRAND: /etc/xdg/menus. .directory files in -#BRAND: %{_datadir}/desktop-directories/Multimedia.directory are part of -#BRAND: the main package. If you need custom one, simply it put there -#BRAND: and modify .menu file to refer to it. - -%description branding-upstream -The package contains an implementation of the draft "Desktop Menu -Specification" from freedesktop.org: - -http://www.freedesktop.org/Standards/menu-spec - -This package provides the upstream definitions for menus. - -This package is provided for backwards compatibility only and is -likely to disappear soon. - %package -n python-gnome-menus License: LGPLv2.1+ Summary: Python Bindings for the GNOME Desktop Menu @@ -116,24 +85,6 @@ This package is provided for backwards compatibility only and is likely to disappear soon. -%package editor -License: GPLv2+ -Summary: Editor for the GNOME Desktop Menu -Group: System/GUI/GNOME -Requires: libgnome-menu2 -Requires: python-gobject -Enhances: %{name} -%py_requires - -%description editor -The package contains an implementation of the draft "Desktop Menu -Specification" from freedesktop.org: - -http://www.freedesktop.org/Standards/menu-spec - -This package is provided for backwards compatibility only and is -likely to disappear soon. - %package devel License: LGPLv2.1+ Summary: The GNOME Desktop Menu @@ -150,10 +101,8 @@ This package is provided for backwards compatibility only and is likely to disappear soon. -%lang_package %prep %setup -q -n %{_name}-%{version} -translation-update-upstream %patch3 %if 0%{?BUILD_FROM_VCS} @@ -167,25 +116,22 @@ %install %makeinstall -%if 0%{?suse_version} <= 1110 -%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* -%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* -%endif -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif -%if 0%{?suse_version} <= 1130 -%{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/* -%endif find %{buildroot} -type f -name "*.la" -delete -print -%find_lang %{_name} %{?no_lang_C} -# Rename applications.menu to not collide with other desktops: -mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu %{buildroot}%{_sysconfdir}/xdg/menus/gnome-applications.menu -%fdupes %{buildroot} -%suse_update_desktop_file gmenu-simple-editor -for dotdirectory in %{buildroot}%{_datadir}/desktop-directories/*.directory; do - %suse_update_desktop_file $dotdirectory -done +## In the legacy package, we only care about the library itself; other files +## will come with the non-legacy package +# Remove .menu and .directory files +rm %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu +rm %{buildroot}%{_datadir}/desktop-directories/*.directory +# Remove editor files +rm %{buildroot}%{_bindir}/gmenu-simple-editor +rm %{buildroot}%{_datadir}/applications/gmenu-simple-editor.desktop +rm -r %{buildroot}%{_datadir}/gnome-menus/ui/ +rm -r %{buildroot}%{py_sitedir}/GMenuSimpleEditor/ +# Remove translations that are only for the editor +rm %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/gnome-menus.mo +# Remove examples with python bindings as we don't encourage people to use +# those anymore +rm %{buildroot}%{_datadir}/gnome-menus/examples/gnome-menus-ls.py %clean rm -rf %{buildroot} @@ -194,43 +140,15 @@ %postun -n libgnome-menu2 -p /sbin/ldconfig -%post editor -%desktop_database_post - -%postun editor -%desktop_database_postun - -%files -%defattr (-, root, root) -%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README -%dir %{_datadir}/desktop-directories -%{_datadir}/desktop-directories/*.directory -%dir %{_sysconfdir}/xdg/menus - %files -n libgnome-menu2 %defattr (-, root, root) +%doc AUTHORS COPYING.LIB ChangeLog NEWS README %{_libdir}/libgnome-menu.so.2* %{_libdir}/girepository-1.0/GMenu-2.0.typelib -%files lang -f %{_name}.lang - -%files branding-upstream -%defattr (-, root, root) -%{_sysconfdir}/xdg/menus/gnome-applications.menu - %files -n python-gnome-menus %defattr (-, root, root) %{py_sitedir}/gmenu.so -%dir %{_datadir}/gnome-menus -%{_datadir}/gnome-menus/examples/ - -%files editor -%defattr (-, root, root) -%{_bindir}/gmenu-simple-editor -%{_datadir}/applications/gmenu-simple-editor.desktop -%dir %{_datadir}/gnome-menus -%{_datadir}/gnome-menus/ui/ -%{py_sitedir}/GMenuSimpleEditor %files devel %defattr (-, root, root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
