Hello community,
here is the log from the commit of package gconf2-branding-openSUSE
checked in at Wed Apr 16 18:31:29 CEST 2008.
--------
--- GNOME/gconf2-branding-openSUSE/gconf2-branding-openSUSE.changes 2008-04-14 20:57:50.000000000 +0200
+++ /mounts/work_src_done/NOARCH/gconf2-branding-openSUSE/gconf2-branding-openSUSE.changes 2008-04-16 18:05:42.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Apr 16 18:02:45 CEST 2008 - sbrabec@suse.cz
+
+- Default background fixes (bnc#369924):
+ * Use wallpaper file from desktop-data-openSUSE.
+ * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
+ package.
+ * Symliked all desktop-data-openSUSE wallpapers for convenience.
+
+-------------------------------------------------------------------
Old:
----
gconf2-branding-openSUSE-background.png
New:
----
gnome-wallpaper-openSUSE-11.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gconf2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.K17788/_old 2008-04-16 18:29:41.000000000 +0200
+++ /var/tmp/diff_new_pack.K17788/_new 2008-04-16 18:29:41.000000000 +0200
@@ -16,14 +16,14 @@
Group: System/GUI/GNOME
Summary: Vendor Defaults for the GNOME 2.x Desktop Configuration Database System
Version: 2.20
-Release: 26
+Release: 28
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source1: panel-default-setup.entries
Source2: %{name}-COPYING
-Source3: %{name}-background.png
+Source3: gnome-wallpaper-openSUSE-11.0.1.tar.bz2
# PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel:
Patch: gnome-panel-layout.patch
Provides: gconf2-branding = 2.20
@@ -32,7 +32,7 @@
Provides: gnome-session-branding = 2.20
Provides: gnome-session-branding-openSUSE = 2.20
Supplements: packageand(branding-openSUSE:gnome-session)
-BuildRequires: gconf2
+BuildRequires: desktop-data-openSUSE gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires: gnome-session
# For directory ownership of %{_datadir}/backgrounds:
@@ -41,7 +41,8 @@
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
# Referenced Metacity theme Gilouche is part of gtk2-theme-openSUSE:
-Requires: gtk2-theme-openSUSE
+Requires: gtk2-theme-openSUSE desktop-data-openSUSE = 11.0
+Suggests: gnome-wallpaper-openSUSE
%description
This package provides Vendor Defaults for configurations based on GConf
@@ -49,20 +50,48 @@
+%package -n gnome-wallpaper-openSUSE
+License: BSD 3-Clause
+Enhances: gconf2-branding-openSUSE
+Summary: Dynamic Wallpaper with openSUSE Look
+Group: System/GUI/GNOME
+Version: 11.0.1
+Release: 1
+
+%description -n gnome-wallpaper-openSUSE
+This optional package contains nice dynamic wallpaper with openSUSE
+look.
+
+It changes its color depending on day time - bright in daylight, dark
+overnight.
+
+
+
+Authors:
+--------
+ Jakub Steiner
+
%prep
-%setup -q -T -c %{name}-%{version}
+%setup -q -T -a3 -c %{name}-%{version}
cp -a %{S:0} gnome-splash-openSUSE.png
cp -a %{S:1} .
cp -a %{S:2} COPYING
-cp -a %{S:3} default-openSUSE.png
%patch
%build
+mkdir -p grass
+cp -a *-grass-*.png grass
%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds
install -m0644 gnome-splash-openSUSE.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
-install -m0644 default-openSUSE.png $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+# GNOME uses %{_datadir}/backgrounds for backgrounds
+ln -s /usr/share/wallpapers/*.jpg /usr/share/wallpapers/*.png $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+# FIXME: Where to install desktop-backgrounds-grass.xml?
+install -m0644 grass.xml $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+# These are png files in real and GNOME refuses to open them
+rm $RPM_BUILD_ROOT%{_datadir}/backgrounds/default-*.jpg
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
@@ -135,7 +164,10 @@
# Auto run video editing program
%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true"
# Change default look of GNOME in libgnome:
-%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/default-openSUSE.png"
+# Change default background (scriptlets may alter this value):
+test -f %{_datadir}/wallpapers/openSUSE110-1600x1200.png
+# WARNING: Don't forget to change value in scriptlets below:
+%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/openSUSE110-1600x1200.png"
%gconf_set /desktop/gnome/background/picture_options --type=string "stretched"
%gconf_set /desktop/gnome/background/primary_color --type=string "#258c06"
%gconf_set /desktop/gnome/background/secondary_color --type=string "#258c06"
@@ -175,20 +207,49 @@
gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/*
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || :
+# This is deliberately done after the merge. We may want to modify it in scriptlets.
%clean
rm -rf $RPM_BUILD_ROOT
+%triggerin -- gnome-wallpaper-openSUSE
+# If gnome-wallpaper-openSUSE exists, we want nice dynamic background.
+gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass.xml"
+
+%triggerpostun -- gnome-wallpaper-openSUSE
+# If gnome-wallpaper-openSUSE exists, we want nice dynamic background.
+if ! test -f %{_datadir}/backgrounds/grass.xml ; then
+ gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/openSUSE110-1600x1200.png"
+fi
+
%files
%defattr(-,root,root)
%doc COPYING
-%{_sysconfdir}/gconf/gconf.xml.vendor/*
-%dir %{_datadir}/backgrounds
-%{_datadir}/backgrounds/default-openSUSE.png
+%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
+%{_datadir}/backgrounds/*.png
+%{_datadir}/backgrounds/*.jpg
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png
+# FIXME: Should be owned by a different package:
+%dir %{_datadir}/backgrounds
+
+%files -n gnome-wallpaper-openSUSE
+%defattr(-,root,root)
+%doc COPYING
+%{_datadir}/backgrounds/grass.xml
+%{_datadir}/backgrounds/grass
+# FIXME: Should be owned by a different package:
+%dir %{_datadir}/backgrounds
%changelog
+* Wed Apr 16 2008 sbrabec@suse.cz
+- Default background fixes (bnc#369924):
+ * Use wallpaper file from desktop-data-openSUSE.
+ * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
+ package.
+ * Symliked all desktop-data-openSUSE wallpapers for convenience.
* Mon Apr 14 2008 mrueckert@suse.de
- dont require packages just for the directory ownership.
* Mon Apr 14 2008 sbrabec@suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org