Hello community,
here is the log from the commit of package branding-openSUSE for
openSUSE:Factory
checked in at Wed Oct 5 18:03:01 CEST 2011.
--------
--- openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes
2011-10-05 11:07:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/branding-openSUSE/branding-openSUSE.changes
2011-10-05 11:00:15.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 5 08:59:37 UTC 2011 - vu...@opensuse.org
+
+- Improve GNOME-related checks in %check so that they cover the
+ dynamic wallpaper and work with the new layout for static
+ wallpaper.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.95Xqwt/_old 2011-10-05 18:02:56.000000000 +0200
+++ /var/tmp/diff_new_pack.95Xqwt/_new 2011-10-05 18:02:56.000000000 +0200
@@ -281,22 +281,22 @@
%check
## Check GNOME-related xml files have contant that make sense
-# Check that all files mentioned in branding-default.xml actually exist
-for file in `sed "s:<[^>]*>::g"
%{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml | grep /usr`; do
- test -f %{buildroot}/${file} || (echo "${file} is mentioned in
openSUSE-default-static.xml but does not exist. Please update
openSUSE-default-static.xml, or contact the GNOME team for help."; false )
+# Check that all files referenced in xml files actually exist
+for xml in %{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml
%{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml; do
+ xml_basename=`basename ${xml}`
+ for file in `sed "s:<[^>]*>::g" ${xml} | grep /usr`; do
+ test -f %{buildroot}/${file} || (echo "${file} is mentioned in
${xml_basename} but does not exist. Please update ${xml_basename}, or contact
the GNOME team for help."; false )
+ done
done
-# Check the wallpaper is correctly set in the xml file for GNOME
-for file in %{buildroot}/usr/share/wallpapers/*.desktop; do
- case $file in
- # default*.desktop are symlinks for KDE to a real wallpaper.
- %{buildroot}/usr/share/wallpapers/default*.desktop)
- ;;
- %{buildroot}/usr/share/wallpapers/openSUSE*.desktop)
+# Check that xml files reference all relevant files
+for file in
%{buildroot}/usr/share/wallpapers/openSUSEdefault/contents/images/*.jpg; do
IMG=${file#%{buildroot}}
- IMG=${IMG%.desktop}
grep -q ${IMG}
%{buildroot}/usr/share/wallpapers/openSUSE-default-static.xml || ( echo "${IMG}
not mentioned in openSUSE-default-static.xml. Please add it there, or contact
the GNOME team for help." ; false )
- ;;
- esac
+done
+WALLPAPER_NAME=`cat openSUSE/wallpaper-name`
+for file in %{buildroot}/usr/share/backgrounds/${WALLPAPER_NAME}/*.jpg; do
+ IMG=${file#%{buildroot}}
+ grep -q ${IMG}
%{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml || ( echo
"${IMG} not mentioned in openSUSE-default-dynamic.xml. Please add it there, or
contact the GNOME team for help." ; false )
done
# Check that the link for the dynamic wallpaper is valid
LINK_TARGET=`readlink --canonicalize
%{buildroot}/usr/share/wallpapers/openSUSE-default-dynamic.xml`
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
