Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Mon Feb 21 17:05:44 CET 2011. -------- --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-10 15:18:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-02-21 15:35:03.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Feb 19 10:37:34 CET 2011 - vuntz@opensuse.org + +- Rename openSUSE-default.xml to openSUSE-default-static.xml: we'll + use openSUSE-default.xml as a symlink to either this static + version or a dynamic version elsewhere. +- Use update-alternatives to create openSUSE-default.xml in this + package, pointing to openSUSE-default-static.xml. +- Do not repackage openSUSE-default.xml and + openSUSE-default-static.xml in extra subpackage. +- Call %suse_update_desktop_file on package-manager.desktop. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openSUSE-default.xml New: ---- openSUSE-default-static.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.j0NeHO/_old 2011-02-21 17:00:50.000000000 +0100 +++ /var/tmp/diff_new_pack.j0NeHO/_new 2011-02-21 17:00:50.000000000 +0100 @@ -21,7 +21,7 @@ Name: desktop-data-openSUSE BuildRequires: fdupes hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version: 11.4 -Release: 3 +Release: 15 %define wallpaper_version 114 Summary: Shared Desktop Files for openSUSE License: GPLv2+ @@ -37,11 +37,13 @@ Requires: hicolor-icon-theme xdg-utils # This is the default cursor theme we reference in /etc/sysconfig/windowmanager Requires: dmz-icon-theme-cursors +Requires(post): update-alternatives +Requires(postun): update-alternatives Source: desktop-data.tar.bz2 Source1: %name.fillup Source2: update_rpm Source3: desktop-data-openSUSE.xml.in -Source4: openSUSE-default.xml +Source4: openSUSE-default-static.xml BuildArch: noarch Provides: desktop-data-SuSE = 11.0 Obsoletes: desktop-data-SuSE <= 11.0 @@ -131,12 +133,14 @@ %install cp -a desktop-data/* $RPM_BUILD_ROOT/ -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default.xml +install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default-static.xml +touch $RPM_BUILD_ROOT/usr/share/wallpapers/openSUSE-default.xml mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged for i in $RPM_BUILD_ROOT/usr/share/desktop-directories/*.directory $RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop do %suse_update_desktop_file "$i" done +%suse_update_desktop_file package-manager # # define default mouse cursor # @@ -163,6 +167,13 @@ %{fillup_only -an windowmanager} # 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 + +%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 %clean rm -rf $RPM_BUILD_ROOT @@ -184,7 +195,8 @@ # WARNING: If you modify pattern, you must modify also XML generator pattern. /usr/share/wallpapers/default* /usr/share/wallpapers/openSUSE%{wallpaper_version}* -/usr/share/wallpapers/openSUSE-default.xml +%ghost /usr/share/wallpapers/openSUSE-default.xml +/usr/share/wallpapers/openSUSE-default-static.xml /etc/profile.d/desktop-data.* /var/adm/fillup-templates/sysconfig.windowmanager-%name /usr/bin/call-browser @@ -201,6 +213,7 @@ /usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml %exclude /usr/share/wallpapers/default* %exclude /usr/share/wallpapers/openSUSE%{wallpaper_version}* +%exclude /usr/share/wallpapers/openSUSE-default*.xml /usr/share/wallpapers # FIXME: It should be owned by a different package: %dir /usr/share/gnome-background-properties ++++++ desktop-data-openSUSE.xml.in ++++++ --- /var/tmp/diff_new_pack.j0NeHO/_old 2011-02-21 17:00:50.000000000 +0100 +++ /var/tmp/diff_new_pack.j0NeHO/_new 2011-02-21 17:00:50.000000000 +0100 @@ -2,7 +2,7 @@ <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> <wallpapers> <wallpaper deleted="false"> - <filename>/usr/share/wallpapers/openSUSE-default.xml</filename> + <filename>/usr/share/wallpapers/openSUSE-default-static.xml</filename> <options>zoom</options> <name>openSUSE @VERSION@</name> </wallpaper> ++++++ openSUSE-default-static.xml ++++++ <background> <static> <!-- 100 days --> <duration>8640000.0</duration> <file> <size width="1600" height="1200">/usr/share/wallpapers/openSUSE114-1600x1200.jpg</size> <size width="1920" height="1200">/usr/share/wallpapers/openSUSE114-1920x1200.jpg</size> </file> </static> </background> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org