Hello community,
here is the log from the commit of package desktop-data-openSUSE for
openSUSE:Factory
checked in at Fri Sep 23 10:24:07 CEST 2011.
--------
--- desktop-data-openSUSE/desktop-data-openSUSE.changes 2011-09-21
17:53:54.000000000 +0200
+++
/mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes
2011-09-22 18:04:04.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Sep 22 15:48:46 UTC 2011 - vu...@opensuse.org
+
+- Drop the bits related to creating the XML file used by GNOME for
+ the default wallpaper, including the alternatives handling. This
+ all moves to branding-openSUSE now.
+
+-------------------------------------------------------------------
+Thu Sep 22 14:02:08 UTC 2011 - co...@suse.com
+
+- wallpaper moved out of here, so require it
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
desktop-data-openSUSE.xml.in
openSUSE-default-static.xml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ desktop-data-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.MYkMHu/_old 2011-09-23 10:24:03.000000000 +0200
+++ /var/tmp/diff_new_pack.MYkMHu/_new 2011-09-23 10:24:03.000000000 +0200
@@ -35,13 +35,12 @@
Requires: hicolor-icon-theme xdg-utils
# This is the default cursor theme we reference in /etc/sysconfig/windowmanager
Requires: dmz-icon-theme-cursors
+Requires: wallpaper-branding-openSUSE = %{version}
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-static.xml
Patch0: hidden-fix.diff
BuildArch: noarch
Provides: desktop-data-SuSE = 11.0
@@ -75,14 +74,8 @@
%patch0 -p1
%build
+# Convert KDE style wallpaper desktop files to gnome-wp-list
mkdir -p desktop-data/usr/share/gnome-background-properties
-sed "s:@VERSION@:%{version}:g" %SOURCE3 >
desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE.xml
-
-# Check that all files mentioned in openSUSE-default.xml actually exist
-for file in `sed "s:<[^>]*>::g" %SOURCE4 | grep /usr`; do
- test -f desktop-data/${file} || (echo "${file} is mentioned in %SOURCE4
but does not exist. Please update %SOURCE4, or contact the GNOME team for
help."; false )
-done
-
cat
>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
<<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
@@ -90,27 +83,9 @@
EOF
for i in desktop-data/usr/share/wallpapers/*.desktop
do
- # Convert KDE style wallpaper desktop files to gnome-wp-list
- case $i in
- # default*.desktop are symlinks for KDE to a real wallpaper.
- desktop-data/usr/share/wallpapers/default*.desktop )
- GNOMEXML=
- ;;
- # the default openSUSE wallpaper is handled differently
- desktop-data/usr/share/wallpapers/openSUSE%{wallpaper_version}*.desktop
)
- GNOMEXML=
IMG=${i#desktop-data}
IMG=${IMG%.desktop}
- grep -q ${IMG} %SOURCE4 || ( echo "${IMG} not mentioned in
%SOURCE4. Please add it there, or contact the GNOME team for help." ; false )
- ;;
- *.desktop )
-
GNOMEXML=desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
- ;;
- esac
- if test -n "$GNOMEXML" ; then
- IMG=${i#desktop-data}
- IMG=${IMG%.desktop}
- sed -n >>$GNOMEXML <$i '
+ sed -n
>>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
<$i '
1i \
<wallpaper deleted="false">
$a \
@@ -125,7 +100,6 @@
'
# And finally delete X-GNOME-WP-* entries, not needed for KDE style
desktop files.
sed -i '/^X-GNOME-WP-/d' $i
- fi
done
cat
>>desktop-data/usr/share/gnome-background-properties/desktop-data-openSUSE-extra.xml
<<EOF
</wallpapers>
@@ -133,8 +107,6 @@
%install
cp -a desktop-data/* $RPM_BUILD_ROOT/
-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
@@ -167,7 +139,6 @@
%{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
%if 0%{?suse_version} > 1130
%icon_theme_cache_post
%else
@@ -175,10 +146,6 @@
%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
@@ -191,7 +158,6 @@
%dir /etc/xdg/menus/applications-merged
%config(noreplace) /etc/xdg/menus/*.menu
/usr/share/desktop-*
-/usr/share/gnome-background-properties/desktop-data-openSUSE.xml
/usr/share/icons/hicolor/*/*/*
%dir /usr/share/icons/oxygen
%dir /usr/share/icons/oxygen/32x32
@@ -199,11 +165,6 @@
/usr/share/icons/oxygen/*/*/*
/usr/share/pixmaps/*
/usr/share/applications/package-manager.desktop
-# WARNING: If you modify pattern, you must modify also XML generator pattern.
-/usr/share/wallpapers/default*
-/usr/share/wallpapers/openSUSE%{wallpaper_version}*
-%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
@@ -212,16 +173,11 @@
%dir /etc/kde4
%dir /etc/kde4/kdm
%config /etc/kde4/kdm/backgroundrc
-# FIXME: It should be owned by a different package:
-%dir /usr/share/gnome-background-properties
%files extra
%defattr(-,root,root)
/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
+/usr/share/wallpapers/
# FIXME: It should be owned by a different package:
%dir /usr/share/gnome-background-properties
++++++ 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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
