Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Mon Sep 12 10:23:40 CEST 2011.
-------- --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-21 15:35:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-06 08:48:26.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Aug 25 03:28:42 UTC 2011 - badshah...@gmail.com + +- Added package-manager-icon of sizes 64x64, 128x128, 256x256 + and scalable svg (bnc#713902) +- Add post and postun macros to update hicolor icon-theme cache +- Add patch to fix the category of package-manager.desktop file +- Bumped release number + +------------------------------------------------------------------- +Tue Apr 12 03:09:07 UTC 2011 - an...@opensuse.org + +- Added patch to fix hidden entries (bnc#686786) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- hidden-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.JPuC7w/_old 2011-09-12 10:23:35.000000000 +0200 +++ /var/tmp/diff_new_pack.JPuC7w/_new 2011-09-12 10:23:35.000000000 +0200 @@ -15,13 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version: 11.4 -Release: 15 +Release: 16 %define wallpaper_version 114 Summary: Shared Desktop Files for openSUSE License: GPLv2+ @@ -44,6 +43,7 @@ Source2: update_rpm Source3: desktop-data-openSUSE.xml.in Source4: openSUSE-default-static.xml +Patch0: hidden-fix.diff BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: desktop-data-SuSE <= 11.0 @@ -73,6 +73,7 @@ %prep %setup -q -c +%patch0 -p1 %build mkdir -p desktop-data/usr/share/gnome-background-properties @@ -168,12 +169,22 @@ # clean up old susewm menus /bin/rm -rf etc/opt/kde3/share/applnk/{Settings,SuSE,work} update-alternatives --install /usr/share/wallpapers/openSUSE-default.xml openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml 5 +%if 0%{?suse_version} > 1130 +%icon_theme_cache_post +%else +gtk-update-icon-cache %{_datadir}/icons/hicolor || true +%endif %postun # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed if [ ! -f /usr/share/wallpapers/openSUSE-default-static.xml ]; then update-alternatives --remove openSUSE-default.xml /usr/share/wallpapers/openSUSE-default-static.xml fi +%if 0%{?suse_version} > 1130 +%icon_theme_cache_postun +%else +gtk-update-icon-cache %{_datadir}/icons/hicolor || true +%endif %clean rm -rf $RPM_BUILD_ROOT ++++++ desktop-data.tar.bz2 ++++++ desktop-data-openSUSE/desktop-data.tar.bz2 /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data.tar.bz2 differ: char 11, line 1 ++++++ hidden-fix.diff ++++++ diff -Nur /desktop-data.orig/etc/xdg/menus/applications.menu /desktop-data/etc/xdg/menus/applications.menu --- /desktop-data.orig/etc/xdg/menus/applications.menu 2011-02-10 16:05:53.000000000 +0300 +++ /desktop-data/etc/xdg/menus/applications.menu 2011-04-12 02:16:26.000000000 +0400 @@ -1300,6 +1300,7 @@ <Name>GNOME Settings</Name> <Directory>suse-settings.directory</Directory> <MergeFile>settings.menu</MergeFile> + <Directory>Hidden.directory</Directory> </Menu> <DefaultMergeDirs/> <MergeFile>applications-kmenuedit.menu</MergeFile> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org