Hello community,
here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory
checked in at Fri Jul 31 19:18:55 CEST 2009.
--------
--- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-05-28 04:05:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-07-31 19:16:51.478286000 +0200
@@ -1,0 +2,12 @@
+Wed Jul 29 13:20:23 CEST 2009 - vuntz@novell.com
+
+- Remove all the gnome-session-branding part: there's no branding
+ there anymore:
+ + Remove gconf2-branding-gnome-splash.png.
+ + Do not set /apps/gnome-session/options/splash_image gconf key.
+ + Do not provide gnome-session-branding*.
+ + Do not supplement gnome-session and branding.
+- Move ownership of datadir/backgrounds to
+ desktop-data-openSUSE-extra-gnome.
+
+-------------------------------------------------------------------
gconf2-branding-SLES.changes: same change
gconf2-branding-openSUSE.changes: same change
gconf2-branding.changes: same change
calling whatdependson for head-i586
Old:
----
gconf2-branding-gnome-splash.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gconf2-branding-SLED.spec ++++++
--- /var/tmp/diff_new_pack.1zKsIQ/_old 2009-07-31 19:17:17.000000000 +0200
+++ /var/tmp/diff_new_pack.1zKsIQ/_new 2009-07-31 19:17:17.000000000 +0200
@@ -41,16 +41,15 @@
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
Name: gconf2-branding-SLED
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Group: System/GUI/GNOME
Summary: SLED defaults for the GNOME configuration system
Version: 2.26
-Release: 4
+Release: 5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: gconf2
Source: gconf2-branding_spec-prepare.sh
-Source1: gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
@@ -69,13 +68,7 @@
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
Supplements: packageand(gconf2:branding-SLED)
-# This package provides openSUSE gnome-session splash:
-Provides: gnome-session-branding = 2.20
-Provides: gnome-session-branding-SLED = 2.20
-Supplements: packageand(gnome-session:branding-SLED)
BuildRequires: desktop-data-%{desktop_data} gconf2
-# For directory ownership of %{_datadir}/pixmaps/splash:
-# BuildRequires: gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires: gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
@@ -101,23 +94,29 @@
%package -n desktop-data-SLED-extra-gnome
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Enhances: gconf2-branding-SLED
Supplements: desktop-data-%{desktop_data}-extra
-Summary: SLED defaults for the GNOME configuration system
+Summary: Dynamic Wallpaper with SLED Look
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 21
+Release: 1
%description -n desktop-data-SLED-extra-gnome
-This package provides SLED defaults for configurations based on GConf
-database system.
+This optional package contains nice dynamic wallpaper with SLED
+look.
+
+It changes its color depending on day time - bright in daylight, dark
+overnight.
+Authors:
+--------
+ Jakub Steiner
+
%prep
%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
-cp -a %{S:1} gnome-splash-SLED.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%patch
@@ -128,8 +127,7 @@
%build
%install
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
-install -m0644 gnome-splash-SLED.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
# current dynamic background
cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
@@ -179,8 +177,6 @@
# (disabled by default because suspending is not working fine in all cases)
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
-# Use custom splash screen in gnome-session:
-%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLED.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
@@ -310,11 +306,7 @@
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%dir %{_datadir}/pixmaps/splash
-%{_datadir}/pixmaps/splash/gnome-splash-SLED.png
%{_datadir}/icons/hicolor/*/*/*.*
-# FIXME: Should be owned by a different package:
-%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%dir %{_datadir}/dist/icons
@@ -329,6 +321,7 @@
%files -n desktop-data-SLED-extra-gnome
%defattr(-,root,root)
%doc COPYING
+%dir %{_datadir}/backgrounds
%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
%if %build_openSUSE
++++++ gconf2-branding-SLES.spec ++++++
--- /var/tmp/diff_new_pack.1zKsIQ/_old 2009-07-31 19:17:17.000000000 +0200
+++ /var/tmp/diff_new_pack.1zKsIQ/_new 2009-07-31 19:17:17.000000000 +0200
@@ -41,16 +41,15 @@
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
Name: gconf2-branding-SLES
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Group: System/GUI/GNOME
Summary: SLES defaults for the GNOME configuration system
Version: 2.26
-Release: 4
+Release: 5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: gconf2
Source: gconf2-branding_spec-prepare.sh
-Source1: gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
@@ -69,13 +68,7 @@
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
Supplements: packageand(gconf2:branding-SLES)
-# This package provides openSUSE gnome-session splash:
-Provides: gnome-session-branding = 2.20
-Provides: gnome-session-branding-SLES = 2.20
-Supplements: packageand(gnome-session:branding-SLES)
BuildRequires: desktop-data-%{desktop_data} gconf2
-# For directory ownership of %{_datadir}/pixmaps/splash:
-# BuildRequires: gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires: gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
@@ -101,23 +94,29 @@
%package -n desktop-data-SLES-extra-gnome
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Enhances: gconf2-branding-SLES
Supplements: desktop-data-%{desktop_data}-extra
-Summary: SLES defaults for the GNOME configuration system
+Summary: Dynamic Wallpaper with SLES Look
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 21
+Release: 1
%description -n desktop-data-SLES-extra-gnome
-This package provides SLES defaults for configurations based on GConf
-database system.
+This optional package contains nice dynamic wallpaper with SLES
+look.
+
+It changes its color depending on day time - bright in daylight, dark
+overnight.
+Authors:
+--------
+ Jakub Steiner
+
%prep
%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
-cp -a %{S:1} gnome-splash-SLES.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%patch
@@ -128,8 +127,7 @@
%build
%install
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
-install -m0644 gnome-splash-SLES.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
# current dynamic background
cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
@@ -179,8 +177,6 @@
# (disabled by default because suspending is not working fine in all cases)
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
-# Use custom splash screen in gnome-session:
-%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLES.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
@@ -310,11 +306,7 @@
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%dir %{_datadir}/pixmaps/splash
-%{_datadir}/pixmaps/splash/gnome-splash-SLES.png
%{_datadir}/icons/hicolor/*/*/*.*
-# FIXME: Should be owned by a different package:
-%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%dir %{_datadir}/dist/icons
@@ -329,6 +321,7 @@
%files -n desktop-data-SLES-extra-gnome
%defattr(-,root,root)
%doc COPYING
+%dir %{_datadir}/backgrounds
%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
%if %build_openSUSE
++++++ gconf2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.1zKsIQ/_old 2009-07-31 19:17:17.000000000 +0200
+++ /var/tmp/diff_new_pack.1zKsIQ/_new 2009-07-31 19:17:17.000000000 +0200
@@ -41,16 +41,15 @@
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
Name: gconf2-branding-openSUSE
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Group: System/GUI/GNOME
-Summary: GNOME configuration system: openSUSE defaults
+Summary: openSUSE defaults for the GNOME configuration system
Version: 2.26
-Release: 4
+Release: 5
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: gconf2
Source: gconf2-branding_spec-prepare.sh
-Source1: gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
@@ -69,13 +68,7 @@
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
Supplements: packageand(gconf2:branding-openSUSE)
-# This package provides openSUSE gnome-session splash:
-Provides: gnome-session-branding = 2.20
-Provides: gnome-session-branding-openSUSE = 2.20
-Supplements: packageand(gnome-session:branding-openSUSE)
BuildRequires: desktop-data-%{desktop_data} gconf2
-# For directory ownership of %{_datadir}/pixmaps/splash:
-# BuildRequires: gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires: gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
@@ -95,19 +88,19 @@
Suggests: desktop-data-openSUSE-extra-gnome
%description
-This package provides openSUSE defaults for configurations based on
-GConf database system.
+This package provides openSUSE defaults for configurations based on GConf
+database system.
%package -n desktop-data-openSUSE-extra-gnome
-License: BSD 3-Clause
+License: BSD 3-clause (or similar)
Enhances: gconf2-branding-openSUSE
Supplements: desktop-data-%{desktop_data}-extra
Summary: Dynamic Wallpaper with openSUSE Look
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 21
+Release: 1
%description -n desktop-data-openSUSE-extra-gnome
This optional package contains nice dynamic wallpaper with openSUSE
@@ -124,7 +117,6 @@
%prep
%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
-cp -a %{S:1} gnome-splash-openSUSE.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%patch
@@ -135,8 +127,7 @@
%build
%install
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
-install -m0644 gnome-splash-openSUSE.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
# current dynamic background
cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
@@ -186,8 +177,6 @@
# (disabled by default because suspending is not working fine in all cases)
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
-# Use custom splash screen in gnome-session:
-%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
@@ -317,11 +306,7 @@
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%dir %{_datadir}/pixmaps/splash
-%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png
%{_datadir}/icons/hicolor/*/*/*.*
-# FIXME: Should be owned by a different package:
-%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%dir %{_datadir}/dist/icons
@@ -336,6 +321,7 @@
%files -n desktop-data-openSUSE-extra-gnome
%defattr(-,root,root)
%doc COPYING
+%dir %{_datadir}/backgrounds
%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
%if %build_openSUSE
++++++ gconf2-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.1zKsIQ/_old 2009-07-31 19:17:17.000000000 +0200
+++ /var/tmp/diff_new_pack.1zKsIQ/_new 2009-07-31 19:17:17.000000000 +0200
@@ -50,7 +50,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: gconf2
Source: gconf2-branding_spec-prepare.sh
-Source1: gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
@@ -69,13 +68,7 @@
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
Supplements: packageand(gconf2:branding-%{branding_name})
-# This package provides openSUSE gnome-session splash:
-Provides: gnome-session-branding = 2.20
-Provides: gnome-session-branding-%{branding_name} = 2.20
-Supplements: packageand(gnome-session:branding-%{branding_name})
BuildRequires: desktop-data-%{desktop_data} gconf2
-# For directory ownership of %{_datadir}/pixmaps/splash:
-# BuildRequires: gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires: gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
@@ -124,7 +117,6 @@
%prep
%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
-cp -a %{S:1} gnome-splash-%{branding_name}.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%patch
@@ -135,8 +127,7 @@
%build
%install
-install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
-install -m0644 gnome-splash-%{branding_name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
# current dynamic background
cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml
@@ -186,8 +177,6 @@
# (disabled by default because suspending is not working fine in all cases)
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
#%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
-# Use custom splash screen in gnome-session:
-%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-%{branding_name}.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
@@ -317,11 +306,7 @@
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%dir %{_datadir}/pixmaps/splash
-%{_datadir}/pixmaps/splash/gnome-splash-%{branding_name}.png
%{_datadir}/icons/hicolor/*/*/*.*
-# FIXME: Should be owned by a different package:
-%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%dir %{_datadir}/dist/icons
@@ -336,6 +321,7 @@
%files -n desktop-data-%{branding_name}-extra-gnome
%defattr(-,root,root)
%doc COPYING
+%dir %{_datadir}/backgrounds
%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml
%if %build_openSUSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org