commit gDesklets for openSUSE:Factory
Hello community, here is the log from the commit of package gDesklets for openSUSE:Factory checked in at Mon Feb 14 01:33:17 CET 2011. -------- --- GNOME/gDesklets/gDesklets.changes 2010-08-11 00:12:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/gDesklets/gDesklets.changes 2011-02-12 20:24:15.000000000 +0100 @@ -1,0 +2,17 @@ +Sat Feb 12 17:22:23 CET 2011 - vuntz@opensuse.org + +- Call relevant macros in %post/%postun: + + %desktop_database_post/postun because the package ships at + least one desktop file. + + %icon_theme_cache_post/postun because the package ships themed + icons. + + %mime_database_post/postun because the package ships a mime + type definition. +- Move icons from the gnome icon theme to hicolor icon theme since + that's where they should live. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gDesklets.spec ++++++ --- /var/tmp/diff_new_pack.SNx32x/_old 2011-02-14 01:32:51.000000000 +0100 +++ /var/tmp/diff_new_pack.SNx32x/_new 2011-02-14 01:32:51.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gDesklets (Version 0.36.2) +# spec file for package gDesklets # -# 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 @@ -20,7 +20,7 @@ Name: gDesklets Version: 0.36.2 -Release: 1 +Release: 2 Url: http://www.gdesklets.de Group: System/GUI/GNOME License: GPLv2+ @@ -40,11 +40,11 @@ BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Requires: %{name}-lang = %{version} Requires: python-gtk Requires: python-orbit Requires: python-gnome Requires: python-xml +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires @@ -74,7 +74,9 @@ %suse_update_desktop_file gdesklets -r System Applet # Change sr@Latn to sr@latin mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin -%find_lang gdesklets +# Move icons in the right icon theme +mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor +%find_lang gdesklets %{?no_lang_C} rm $RPM_BUILD_ROOT%{_libdir}/gdesklets/*/*.la $RPM_BUILD_ROOT%{_libdir}/gdesklets/*/*/*.la %fdupes -s $RPM_BUILD_ROOT @@ -82,14 +84,26 @@ rm -rf $RPM_BUILD_ROOT %post +%if 0%{?suse_version} > 1130 +%desktop_database_post +%icon_theme_cache_post +%mime_database_post +%else if [ -f /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database /usr/share/mime > /dev/null fi +%endif %postun +%if 0%{?suse_version} > 1130 +%desktop_database_postun +%icon_theme_cache_postun +%mime_database_postun +%else if [ -f /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database /usr/share/mime > /dev/null fi +%endif %files %defattr (-, root, root) @@ -99,10 +113,7 @@ %{_libdir}/gdesklets/ %doc %{_mandir}/man1/gdesklets.* %{_datadir}/applications/*.desktop -%dir %{_datadir}/icons/gnome -%dir %{_datadir}/icons/gnome/48x48 -%dir %{_datadir}/icons/gnome/48x48/mimetypes -%{_datadir}/icons/gnome/48x48/mimetypes/*.png +%{_datadir}/icons/hicolor/48x48/mimetypes/*.png %{_datadir}/mime/packages/gdesklets.xml %{_datadir}/pixmaps/gdesklets.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de