Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Fri Sep 24 01:02:15 CEST 2010. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2010-09-13 18:50:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2010-09-24 01:01:35.563423000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 21 19:35:59 CEST 2010 - vuntz@opensuse.org + +- Move the novell sound theme to a novell-sound-theme subpackage, + built only for SLE. +- Rework the packaging of dynamic wallpapers: + + Make all the dynamic wallpapers handling only happen if we + build the openSUSE package. + + Rename desktop-data-%{branding_name}-extra-gnome to + %{branding_name}-dynamic-wallpaper (with appropriate + %Provides/Obsoletes). + + Move the old dynamic wallpapers to + %{branding_name}-dynamic-wallpapers-old so that + %{branding_name}-dynamic-wallpaper is smaller and can be + installed by default. + + Add a Supplements on desktop-data-%{desktop_data} and + gnome-settings-daemon to %{branding_name}-dynamic-wallpaper to + automatically install it by default, and remove the previous + Enhances (gconf2-branding-%{branding_name}) and Supplements + (desktop-data-%{desktop_data}-extra). + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-SLED (Version 11.3) +# spec file for package gconf2-branding-SLED (Version 11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-SLED-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides SLED defaults for configurations based on GConf -database system. +This package provides SLED defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n SLED-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with SLED Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-SLED-extra-gnome = %{version} +Obsoletes: desktop-data-SLED-extra-gnome < %{version} + +%description -n SLED-dynamic-wallpaper +This package contains a dynamic wallpaper with SLED look. -%package -n desktop-data-SLED-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n SLED-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-SLED -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with SLED Look +Summary: Dynamic wallpapers for GNOME, from previous versions of SLED Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 15 +Enhances: SLED-dynamic-wallpaper + +%description -n SLED-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +SLED. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-SLED-extra-gnome -This optional package contains nice dynamic wallpaper with SLED -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-SLED-extra-gnome -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- SLED-dynamic-wallpaper +# If SLED-dynamic-wallpaper 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/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-SLED-extra-gnome -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- SLED-dynamic-wallpaper +# If SLED-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If SLED-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-SLED-extra-gnome +%if %build_openSUSE + +%files -n SLED-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n SLED-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-SLED-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-SLES (Version 11.3) +# spec file for package gconf2-branding-SLES (Version 11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-SLES-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides SLES defaults for configurations based on GConf -database system. +This package provides SLES defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n SLES-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with SLES Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-SLES-extra-gnome = %{version} +Obsoletes: desktop-data-SLES-extra-gnome < %{version} + +%description -n SLES-dynamic-wallpaper +This package contains a dynamic wallpaper with SLES look. -%package -n desktop-data-SLES-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n SLES-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-SLES -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with SLES Look +Summary: Dynamic wallpapers for GNOME, from previous versions of SLES Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 15 +Enhances: SLES-dynamic-wallpaper + +%description -n SLES-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +SLES. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-SLES-extra-gnome -This optional package contains nice dynamic wallpaper with SLES -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-SLES-extra-gnome -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- SLES-dynamic-wallpaper +# If SLES-dynamic-wallpaper 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/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-SLES-extra-gnome -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- SLES-dynamic-wallpaper +# If SLES-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If SLES-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-SLES-extra-gnome +%if %build_openSUSE + +%files -n SLES-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n SLES-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-SLES-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-openSUSE (Version 11.3) +# spec file for package gconf2-branding-openSUSE (Version 11.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -55,28 +58,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system -Version: 11.3 -Release: 2 +Version: %{desktop_data_ver} +Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -87,6 +98,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -97,40 +109,70 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-openSUSE-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %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. +%if %build_openSUSE +%package -n openSUSE-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with openSUSE Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-openSUSE-extra-gnome = %{version} +Obsoletes: desktop-data-openSUSE-extra-gnome < %{version} + +%description -n openSUSE-dynamic-wallpaper +This package contains a dynamic wallpaper with openSUSE look. -%package -n desktop-data-openSUSE-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n openSUSE-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-openSUSE -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with openSUSE Look +Summary: Dynamic wallpapers for GNOME, from previous versions of openSUSE Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 14 +Enhances: openSUSE-dynamic-wallpaper + +%description -n openSUSE-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +openSUSE. + +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif -%description -n desktop-data-openSUSE-extra-gnome -This optional package contains nice dynamic wallpaper with openSUSE -look. +%if %build_SLED || %build_SLES -It changes its color depending on day time - bright in daylight, dark -overnight. +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop + +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -141,11 +183,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml @@ -154,12 +197,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -282,33 +327,38 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-openSUSE-extra-gnome -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE + +%triggerin -- openSUSE-dynamic-wallpaper +# If openSUSE-dynamic-wallpaper 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/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-openSUSE-extra-gnome -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- openSUSE-dynamic-wallpaper +# If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.xml ; then +if [ $1 == 1 ]; then + # If openSUSE-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/IK/IK.xml" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -321,26 +371,38 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-openSUSE-extra-gnome +%if %build_openSUSE + +%files -n openSUSE-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n openSUSE-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES + +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Tue Sep 21 19:35:59 CEST 2010 - vuntz@opensuse.org + +- Move the novell sound theme to a novell-sound-theme subpackage, + built only for SLE. +- Rework the packaging of dynamic wallpapers: + + Make all the dynamic wallpapers handling only happen if we + build the openSUSE package. + + Rename desktop-data-%{branding_name}-extra-gnome to + %{branding_name}-dynamic-wallpaper (with appropriate + %Provides/Obsoletes). + + Move the old dynamic wallpapers to + %{branding_name}-dynamic-wallpapers-old so that + %{branding_name}-dynamic-wallpaper is smaller and can be + installed by default. + + Add a Supplements on desktop-data-%{desktop_data} and + gnome-settings-daemon to %{branding_name}-dynamic-wallpaper to + automatically install it by default, and remove the previous + Enhances (gconf2-branding-%{branding_name}) and Supplements + (desktop-data-%{desktop_data}-extra). + +------------------------------------------------------------------- Sat Sep 4 22:29:42 CEST 2010 - vuntz@opensuse.org - Change notifications to appear at the bottom right since our ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.15mPtv/_old 2010-09-24 01:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.15mPtv/_new 2010-09-24 01:01:49.000000000 +0200 @@ -24,6 +24,7 @@ %if %build_openSUSE %define branding_name openSUSE %define desktop_data openSUSE +%define dynamic_file IK/IK.xml %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg %if %suse_version == 1120 @@ -40,12 +41,14 @@ %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES %define desktop_data SLED %define desktop_data_ver 11 +%define dynamic_file nonexisting %define wallpaper_file SLED110-1600x1200.png %endif @@ -53,28 +56,36 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: %{branding_name} defaults for the GNOME configuration system -Version: 11.3 +Version: %{desktop_data_ver} Release: 1 Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched SuSE version): +# panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING -Source4: gnome-wallpaper-11.0.2.tar.bz2 -Source5: GnomeOnlineHelp.desktop -Source8: suse-help.svg -Source9: gnome-wallpaper-11.1.tar.bz2 -Source10: novell-sound-index.theme -Source11: novell-sound-desktop-login.ogg -Source12: gnome-wallpaper-11.2.tar.bz2 -Source13: gnome-wallpaper-11.3.tar.bz2 +%if %build_openSUSE +# Launchers on the desktop +Source10: GnomeOnlineHelp.desktop +Source11: suse-help.svg +%endif +%if %build_openSUSE +# Dynamic wallpapers +Source20: gnome-wallpaper-11.0.2.tar.bz2 +Source21: gnome-wallpaper-11.1.tar.bz2 +Source22: gnome-wallpaper-11.2.tar.bz2 +Source23: gnome-wallpaper-11.3.tar.bz2 +%endif +%if %build_SLED || %build_SLES +# Novell sound theme +Source30: novell-sound-index.theme +Source31: novell-sound-desktop-login.ogg +%endif Source99: HACKING # PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel: Patch0: gnome-panel-layout.patch # PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel: Patch1: gnome-panel-layout-SLES.patch -BuildRequires: desktop-data-%{desktop_data} gconf2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: desktop-data-%{desktop_data} +BuildRequires: gconf2 %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) @@ -85,6 +96,7 @@ #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. PreReq: gconf2 +# Wallpaper Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} # Icon theme Requires: sonar-icon-theme @@ -95,40 +107,68 @@ # Window title font Requires: fifth-leg-font %if %build_SLED || %build_SLES -# the sound theme inherits from the freedesktop one -Requires: sound-theme-freedesktop +# Sound theme +Requires: novell-sound-theme %endif %if ! %build_SLES # tomboy is in the default panel configuration # FIXME: this should be a Requires, but see bnc#531836 Recommends: tomboy %endif -Suggests: desktop-data-%{branding_name}-extra-gnome +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package provides %{branding_name} defaults for configurations based on GConf -database system. +This package provides %{branding_name} defaults for configurations based +on GConf database system. +%if %build_openSUSE +%package -n %{branding_name}-dynamic-wallpaper +License: BSD3c(or similar) +Summary: Dynamic wallpaper for GNOME, with %{branding_name} Look +Group: System/GUI/GNOME +Supplements: packageand(desktop-data-%{desktop_data}:gnome-settings-daemon) +Provides: desktop-data-%{branding_name}-extra-gnome = %{version} +Obsoletes: desktop-data-%{branding_name}-extra-gnome < %{version} +%description -n %{branding_name}-dynamic-wallpaper +This package contains a dynamic wallpaper with %{branding_name} look. -%package -n desktop-data-%{branding_name}-extra-gnome +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. + +%package -n %{branding_name}-dynamic-wallpapers-old License: BSD3c(or similar) -Enhances: gconf2-branding-%{branding_name} -Supplements: desktop-data-%{desktop_data}-extra -Summary: Dynamic Wallpaper with %{branding_name} Look +Summary: Dynamic wallpapers for GNOME, from previous versions of %{branding_name} Group: System/GUI/GNOME -Version: %{desktop_data_ver} -Release: 1 +Enhances: %{branding_name}-dynamic-wallpaper + +%description -n %{branding_name}-dynamic-wallpapers-old +This package contains dynamic wallpapers from previous versions of +%{branding_name}. -%description -n desktop-data-%{branding_name}-extra-gnome -This optional package contains nice dynamic wallpaper with %{branding_name} -look. +A dynamic wallpaper changes depending on the time of the day: it is +generally bright during the day, and dark during the night. +%endif + +%if %build_SLED || %build_SLES +%package -n novell-sound-theme +License: BSD3c(or similar) +Summary: Novell Sound Theme +Group: System/GUI/GNOME +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop -It changes its color depending on day time - bright in daylight, dark -overnight. +%description -n novell-sound-theme +This packages provides the default sound theme by Novell. +%endif %prep -%setup -q -T -a4 -a9 -a12 -a13 -c %{name}-%{version} +%if %build_openSUSE +%setup -q -T -a20 -a21 -a22 -a23 -c %{name}-%{version} +%else +%setup -q -T -c %{name}-%{version} +%endif cp -a %{S:2} . cp -a %{S:3} COPYING %patch0 @@ -139,11 +179,12 @@ %build %install +# dynamic backgrounds +%if %build_openSUSE install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties # current dynamic background cp -a gnome-wallpaper-11.3/IK $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml -%if %build_openSUSE +install -m0644 gnome-wallpaper-11.3/desktop-backgrounds-IK.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml # old 11.0, 11.1, 11.2 dynamic backgrounds cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml @@ -152,12 +193,14 @@ cp -a daft $RPM_BUILD_ROOT%{_datadir}/backgrounds/ install -m0644 desktop-backgrounds-daft.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.2-extra-gnome.xml %endif +# # sound theme %if %build_SLED || %build_SLES install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo -install -m0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme -install -m0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg +install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme +install -m0644 %{S:31} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg %endif +# # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -280,33 +323,37 @@ install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files install -d $RPM_BUILD_ROOT%{_datadir}/dist/icons %if %build_openSUSE -install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ +install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: -install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ +install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ %endif %clean rm -rf $RPM_BUILD_ROOT -%triggerin -- desktop-data-%{branding_name}-extra-gnome -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. +%if %build_openSUSE +%triggerin -- %{branding_name}-dynamic-wallpaper +# If %{branding_name}-dynamic-wallpaper 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/IK/IK.xml" || true + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true -%triggerpostun -- desktop-data-%{branding_name}-extra-gnome -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. -if ! test -f %{_datadir}/backgrounds/IK/IK.xml ; then +%triggerpostun -- %{branding_name}-dynamic-wallpaper +# If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi %post -# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background. -if test -f %{_datadir}/backgrounds/IK/IK.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/IK/IK.xml" +if [ $1 == 1 ]; then + # If %{branding_name}-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. + if test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" + fi fi +%endif %files %defattr(-,root,root) @@ -319,26 +366,36 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif -%if %build_SLED || %build_SLES -%{_datadir}/sounds/novell -%endif -%files -n desktop-data-%{branding_name}-extra-gnome +%if %build_openSUSE +%files -n %{branding_name}-dynamic-wallpaper %defattr(-,root,root) %doc COPYING +%{_datadir}/backgrounds/IK/ +%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml +# FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds -%{_datadir}/backgrounds/IK -%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml -%if %build_openSUSE -%{_datadir}/backgrounds/grass +%dir %{_datadir}/gnome-background-properties + +%files -n %{branding_name}-dynamic-wallpapers-old +%defattr(-,root,root) +%doc COPYING +%{_datadir}/backgrounds/grass/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml -%{_datadir}/backgrounds/glass +%{_datadir}/backgrounds/glass/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft +%{_datadir}/backgrounds/daft/ %{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.2-extra-gnome.xml -%endif # FIXME: Should be owned by a different package: %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%endif + +%if %build_SLED || %build_SLES +%files -n novell-sound-theme +%defattr(-,root,root) +%doc COPYING +%{_datadir}/sounds/novell/ +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org