Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Wed Oct 5 17:37:10 CEST 2011.
-------- --- openSUSE:Factory/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-09-26 10:30:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-10-05 12:27:59.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Oct 4 15:44:02 UTC 2011 - [email protected] + +- Remove openSUSE-dynamic-wallpaper subpackage: this has now moved + to the branding-openSUSE source package. +- Remove openSUSE-dynamic-wallpapers-old: this is moving to a new + dynamic-wallpapers-11x source package. Also remove the + gnome-wallpaper-* source files that were needed only for this. +- Remove now unneeded desktop-data-openSUSE BuildRequires: this was + only needed for the dynamic wallpaper. +- Stop changing /apps/gnome_settings_daemon/toggle_mute gconf key: + this is now handled with a GSettings override, in + glib2-branding-openSUSE. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 Old: ---- gnome-wallpaper-11.0.2.tar.bz2 gnome-wallpaper-11.1.tar.bz2 gnome-wallpaper-11.2.tar.bz2 gnome-wallpaper-11.3.tar.bz2 gnome-wallpaper-11.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.0hxwp2/_old 2011-10-05 17:37:04.000000000 +0200 +++ /var/tmp/diff_new_pack.0hxwp2/_new 2011-10-05 17:37:04.000000000 +0200 @@ -24,20 +24,14 @@ %if %build_openSUSE %define branding_name openSUSE %define pkg_version 12.1 -%define desktop_data openSUSE -%define dynamic_file stripes/stripes.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif %if %build_SLES %define branding_name SLES %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -56,21 +50,12 @@ 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 -Source24: gnome-wallpaper-11.4.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 -BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes @@ -93,38 +78,6 @@ 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 -Requires(post): update-alternatives -Requires(postun): update-alternatives -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. - -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) -Summary: Dynamic wallpapers for GNOME, from previous versions of SLED -Group: System/GUI/GNOME -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 - %if %build_SLED || %build_SLES %package -n novell-sound-theme @@ -139,53 +92,12 @@ %endif %prep -%if %build_openSUSE -%setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} -%else %setup -q -T -c %{name}-%{version} -%endif cp -a %{S:3} COPYING %build -%if %suse_version < 1140 -echo "Sorry, the setup to install the default background only works on 11.4 and later when building this package." -false -%endif %install -# dynamic backgrounds -%if %build_openSUSE -# Here's the setup we use (assuming openSUSE for branding in this example): -# - /usr/share/wallpapers/openSUSE-default.xml is the default background -# - /usr/share/wallpapers/openSUSE-default.xml is a symlink (via -# update-alternatives) to either the background from desktop-data-openSUSE or -# /usr/share/wallpapers/openSUSE-default-dynamic.xml from openSUSE-dynamic-background -# - /usr/share/wallpapers/openSUSE-default-dynamic.xml is a symlink to the -# dynamic background matching the default background of the distribution we -# build against -# -# WARNING WARNING WARNING -# If we ever remove the dynamic background, then the -# SLED-default-dynamic.xml file should still be shipped, as a -# symlink to SLED-default-static.xml. -# -install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties $RPM_BUILD_ROOT%{_datadir}/wallpapers -ln -s %{_datadir}/backgrounds/%{dynamic_file} $RPM_BUILD_ROOT%{_datadir}/wallpapers/SLED-default-dynamic.xml -touch $RPM_BUILD_ROOT%{_datadir}/wallpapers/SLED-default.xml -# install 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 -cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.1-extra-gnome.xml -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 -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-11.3-extra-gnome.xml -cp -a stripes $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -# Do not install the xml file of current dynamic background for gnome-control-center; instead create one based on the static background -sed "s:SLED-default-static.xml:SLED-default-dynamic.xml:g" %{_datadir}/gnome-background-properties/wallpaper-branding-SLED.xml > $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml -###install -m0644 desktop-backgrounds-stripes.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLED-11.4-extra-gnome.xml -%endif # # sound theme %if %build_SLED || %build_SLES @@ -199,7 +111,6 @@ # Stuff to "Make OpenSUSE working must remain in particular packages! %define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor %define gconf_set %gconf_call --set -%define gconf_load %gconf_call --load mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" @@ -207,9 +118,6 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Define default keybinding of gnome-settings-daemon: -# FIX-OPENSUSE bnc#462640 [email protected] -- mute button always mute, instead of toggling -%gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" # Do not retain PK authorizations by default (bnc#431569) [email protected] @@ -255,19 +163,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %build_openSUSE - -%post -n SLED-dynamic-wallpaper -update-alternatives --install %{_datadir}/wallpapers/SLED-default.xml SLED-default.xml %{_datadir}/wallpapers/SLED-default-dynamic.xml 10 - -%postun -n SLED-dynamic-wallpaper -# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f %{_datadir}/wallpapers/SLED-default-dynamic.xml ]; then - update-alternatives --remove SLED-default.xml %{_datadir}/wallpapers/SLED-default-dynamic.xml -fi - -%endif # %%build_openSUSE - %files %defattr(-,root,root) %doc COPYING @@ -280,36 +175,6 @@ %{_datadir}/dist/icons/* %endif -%if %build_openSUSE - -%files -n SLED-dynamic-wallpaper -%defattr(-,root,root) -%doc COPYING -# FIXME: Should be owned by a different package: -%dir %{_datadir}/backgrounds -%dir %{_datadir}/gnome-background-properties -%{_datadir}/backgrounds/stripes/ -%{_datadir}/gnome-background-properties/SLED-dynamic-wallpaper.xml -%dir %{_datadir}/wallpapers -%ghost %{_datadir}/wallpapers/SLED-default.xml -%{_datadir}/wallpapers/SLED-default-dynamic.xml - -%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}/gnome-background-properties/desktop-data-SLED-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft/ -%{_datadir}/gnome-background-properties/desktop-data-SLED-11.2-extra-gnome.xml -%{_datadir}/backgrounds/IK/ -%{_datadir}/gnome-background-properties/desktop-data-SLED-11.3-extra-gnome.xml -# 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 ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.0hxwp2/_old 2011-10-05 17:37:04.000000000 +0200 +++ /var/tmp/diff_new_pack.0hxwp2/_new 2011-10-05 17:37:04.000000000 +0200 @@ -24,20 +24,14 @@ %if %build_openSUSE %define branding_name openSUSE %define pkg_version 12.1 -%define desktop_data openSUSE -%define dynamic_file stripes/stripes.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif %if %build_SLES %define branding_name SLES %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -56,21 +50,12 @@ 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 -Source24: gnome-wallpaper-11.4.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 -BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes @@ -93,38 +78,6 @@ 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 -Requires(post): update-alternatives -Requires(postun): update-alternatives -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. - -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) -Summary: Dynamic wallpapers for GNOME, from previous versions of SLES -Group: System/GUI/GNOME -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 - %if %build_SLED || %build_SLES %package -n novell-sound-theme @@ -139,53 +92,12 @@ %endif %prep -%if %build_openSUSE -%setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} -%else %setup -q -T -c %{name}-%{version} -%endif cp -a %{S:3} COPYING %build -%if %suse_version < 1140 -echo "Sorry, the setup to install the default background only works on 11.4 and later when building this package." -false -%endif %install -# dynamic backgrounds -%if %build_openSUSE -# Here's the setup we use (assuming openSUSE for branding in this example): -# - /usr/share/wallpapers/openSUSE-default.xml is the default background -# - /usr/share/wallpapers/openSUSE-default.xml is a symlink (via -# update-alternatives) to either the background from desktop-data-openSUSE or -# /usr/share/wallpapers/openSUSE-default-dynamic.xml from openSUSE-dynamic-background -# - /usr/share/wallpapers/openSUSE-default-dynamic.xml is a symlink to the -# dynamic background matching the default background of the distribution we -# build against -# -# WARNING WARNING WARNING -# If we ever remove the dynamic background, then the -# SLES-default-dynamic.xml file should still be shipped, as a -# symlink to SLES-default-static.xml. -# -install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties $RPM_BUILD_ROOT%{_datadir}/wallpapers -ln -s %{_datadir}/backgrounds/%{dynamic_file} $RPM_BUILD_ROOT%{_datadir}/wallpapers/SLES-default-dynamic.xml -touch $RPM_BUILD_ROOT%{_datadir}/wallpapers/SLES-default.xml -# install 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 -cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.1-extra-gnome.xml -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 -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-11.3-extra-gnome.xml -cp -a stripes $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -# Do not install the xml file of current dynamic background for gnome-control-center; instead create one based on the static background -sed "s:SLES-default-static.xml:SLES-default-dynamic.xml:g" %{_datadir}/gnome-background-properties/wallpaper-branding-SLES.xml > $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml -###install -m0644 desktop-backgrounds-stripes.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/SLES-11.4-extra-gnome.xml -%endif # # sound theme %if %build_SLED || %build_SLES @@ -199,7 +111,6 @@ # Stuff to "Make OpenSUSE working must remain in particular packages! %define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor %define gconf_set %gconf_call --set -%define gconf_load %gconf_call --load mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" @@ -207,9 +118,6 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Define default keybinding of gnome-settings-daemon: -# FIX-OPENSUSE bnc#462640 [email protected] -- mute button always mute, instead of toggling -%gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" # Do not retain PK authorizations by default (bnc#431569) [email protected] @@ -255,19 +163,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %build_openSUSE - -%post -n SLES-dynamic-wallpaper -update-alternatives --install %{_datadir}/wallpapers/SLES-default.xml SLES-default.xml %{_datadir}/wallpapers/SLES-default-dynamic.xml 10 - -%postun -n SLES-dynamic-wallpaper -# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f %{_datadir}/wallpapers/SLES-default-dynamic.xml ]; then - update-alternatives --remove SLES-default.xml %{_datadir}/wallpapers/SLES-default-dynamic.xml -fi - -%endif # %%build_openSUSE - %files %defattr(-,root,root) %doc COPYING @@ -280,36 +175,6 @@ %{_datadir}/dist/icons/* %endif -%if %build_openSUSE - -%files -n SLES-dynamic-wallpaper -%defattr(-,root,root) -%doc COPYING -# FIXME: Should be owned by a different package: -%dir %{_datadir}/backgrounds -%dir %{_datadir}/gnome-background-properties -%{_datadir}/backgrounds/stripes/ -%{_datadir}/gnome-background-properties/SLES-dynamic-wallpaper.xml -%dir %{_datadir}/wallpapers -%ghost %{_datadir}/wallpapers/SLES-default.xml -%{_datadir}/wallpapers/SLES-default-dynamic.xml - -%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}/gnome-background-properties/desktop-data-SLES-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft/ -%{_datadir}/gnome-background-properties/desktop-data-SLES-11.2-extra-gnome.xml -%{_datadir}/backgrounds/IK/ -%{_datadir}/gnome-background-properties/desktop-data-SLES-11.3-extra-gnome.xml -# 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 ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0hxwp2/_old 2011-10-05 17:37:04.000000000 +0200 +++ /var/tmp/diff_new_pack.0hxwp2/_new 2011-10-05 17:37:04.000000000 +0200 @@ -24,20 +24,14 @@ %if %build_openSUSE %define branding_name openSUSE %define pkg_version 12.1 -%define desktop_data openSUSE -%define dynamic_file stripes/stripes.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif %if %build_SLES %define branding_name SLES %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -56,21 +50,12 @@ 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 -Source24: gnome-wallpaper-11.4.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 -BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes @@ -93,38 +78,6 @@ 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 -Requires(post): update-alternatives -Requires(postun): update-alternatives -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. - -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) -Summary: Dynamic wallpapers for GNOME, from previous versions of openSUSE -Group: System/GUI/GNOME -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 - %if %build_SLED || %build_SLES %package -n novell-sound-theme @@ -139,53 +92,12 @@ %endif %prep -%if %build_openSUSE -%setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} -%else %setup -q -T -c %{name}-%{version} -%endif cp -a %{S:3} COPYING %build -%if %suse_version < 1140 -echo "Sorry, the setup to install the default background only works on 11.4 and later when building this package." -false -%endif %install -# dynamic backgrounds -%if %build_openSUSE -# Here's the setup we use (assuming openSUSE for branding in this example): -# - /usr/share/wallpapers/openSUSE-default.xml is the default background -# - /usr/share/wallpapers/openSUSE-default.xml is a symlink (via -# update-alternatives) to either the background from desktop-data-openSUSE or -# /usr/share/wallpapers/openSUSE-default-dynamic.xml from openSUSE-dynamic-background -# - /usr/share/wallpapers/openSUSE-default-dynamic.xml is a symlink to the -# dynamic background matching the default background of the distribution we -# build against -# -# WARNING WARNING WARNING -# If we ever remove the dynamic background, then the -# openSUSE-default-dynamic.xml file should still be shipped, as a -# symlink to openSUSE-default-static.xml. -# -install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties $RPM_BUILD_ROOT%{_datadir}/wallpapers -ln -s %{_datadir}/backgrounds/%{dynamic_file} $RPM_BUILD_ROOT%{_datadir}/wallpapers/openSUSE-default-dynamic.xml -touch $RPM_BUILD_ROOT%{_datadir}/wallpapers/openSUSE-default.xml -# install 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 -cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.1-extra-gnome.xml -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 -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-11.3-extra-gnome.xml -cp -a stripes $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -# Do not install the xml file of current dynamic background for gnome-control-center; instead create one based on the static background -sed "s:openSUSE-default-static.xml:openSUSE-default-dynamic.xml:g" %{_datadir}/gnome-background-properties/wallpaper-branding-openSUSE.xml > $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml -###install -m0644 desktop-backgrounds-stripes.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/openSUSE-11.4-extra-gnome.xml -%endif # # sound theme %if %build_SLED || %build_SLES @@ -199,7 +111,6 @@ # Stuff to "Make OpenSUSE working must remain in particular packages! %define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor %define gconf_set %gconf_call --set -%define gconf_load %gconf_call --load mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" @@ -207,9 +118,6 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Define default keybinding of gnome-settings-daemon: -# FIX-OPENSUSE bnc#462640 [email protected] -- mute button always mute, instead of toggling -%gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" # Do not retain PK authorizations by default (bnc#431569) [email protected] @@ -255,19 +163,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %build_openSUSE - -%post -n openSUSE-dynamic-wallpaper -update-alternatives --install %{_datadir}/wallpapers/openSUSE-default.xml openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-dynamic.xml 10 - -%postun -n openSUSE-dynamic-wallpaper -# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f %{_datadir}/wallpapers/openSUSE-default-dynamic.xml ]; then - update-alternatives --remove openSUSE-default.xml %{_datadir}/wallpapers/openSUSE-default-dynamic.xml -fi - -%endif # %%build_openSUSE - %files %defattr(-,root,root) %doc COPYING @@ -280,36 +175,6 @@ %{_datadir}/dist/icons/* %endif -%if %build_openSUSE - -%files -n openSUSE-dynamic-wallpaper -%defattr(-,root,root) -%doc COPYING -# FIXME: Should be owned by a different package: -%dir %{_datadir}/backgrounds -%dir %{_datadir}/gnome-background-properties -%{_datadir}/backgrounds/stripes/ -%{_datadir}/gnome-background-properties/openSUSE-dynamic-wallpaper.xml -%dir %{_datadir}/wallpapers -%ghost %{_datadir}/wallpapers/openSUSE-default.xml -%{_datadir}/wallpapers/openSUSE-default-dynamic.xml - -%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}/gnome-background-properties/desktop-data-openSUSE-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft/ -%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.2-extra-gnome.xml -%{_datadir}/backgrounds/IK/ -%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.3-extra-gnome.xml -# 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 ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.0hxwp2/_old 2011-10-05 17:37:05.000000000 +0200 +++ /var/tmp/diff_new_pack.0hxwp2/_new 2011-10-05 17:37:05.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Oct 4 15:44:02 UTC 2011 - [email protected] + +- Remove openSUSE-dynamic-wallpaper subpackage: this has now moved + to the branding-openSUSE source package. +- Remove openSUSE-dynamic-wallpapers-old: this is moving to a new + dynamic-wallpapers-11x source package. Also remove the + gnome-wallpaper-* source files that were needed only for this. +- Remove now unneeded desktop-data-openSUSE BuildRequires: this was + only needed for the dynamic wallpaper. +- Stop changing /apps/gnome_settings_daemon/toggle_mute gconf key: + this is now handled with a GSettings override, in + glib2-branding-openSUSE. + +------------------------------------------------------------------- Sun Sep 25 23:39:51 UTC 2011 - [email protected] - Update after move of default wallpaper to branding-openSUSE: the ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.0hxwp2/_old 2011-10-05 17:37:05.000000000 +0200 +++ /var/tmp/diff_new_pack.0hxwp2/_new 2011-10-05 17:37:05.000000000 +0200 @@ -24,20 +24,14 @@ %if %build_openSUSE %define branding_name openSUSE %define pkg_version 12.1 -%define desktop_data openSUSE -%define dynamic_file stripes/stripes.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif %if %build_SLES %define branding_name SLES %define pkg_version 11 -%define desktop_data SLED -%define dynamic_file nonexisting %endif Name: gconf2-branding-%{branding_name} @@ -54,21 +48,12 @@ 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 -Source24: gnome-wallpaper-11.4.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 -BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes @@ -91,37 +76,6 @@ 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 -Requires(post): update-alternatives -Requires(postun): update-alternatives -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. - -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) -Summary: Dynamic wallpapers for GNOME, from previous versions of %{branding_name} -Group: System/GUI/GNOME -Enhances: %{branding_name}-dynamic-wallpaper - -%description -n %{branding_name}-dynamic-wallpapers-old -This package contains dynamic wallpapers from previous versions of -%{branding_name}. - -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) @@ -135,53 +89,12 @@ %endif %prep -%if %build_openSUSE -%setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} -%else %setup -q -T -c %{name}-%{version} -%endif cp -a %{S:3} COPYING %build -%if %suse_version < 1140 -echo "Sorry, the setup to install the default background only works on 11.4 and later when building this package." -false -%endif %install -# dynamic backgrounds -%if %build_openSUSE -# Here's the setup we use (assuming openSUSE for branding in this example): -# - /usr/share/wallpapers/openSUSE-default.xml is the default background -# - /usr/share/wallpapers/openSUSE-default.xml is a symlink (via -# update-alternatives) to either the background from desktop-data-openSUSE or -# /usr/share/wallpapers/openSUSE-default-dynamic.xml from openSUSE-dynamic-background -# - /usr/share/wallpapers/openSUSE-default-dynamic.xml is a symlink to the -# dynamic background matching the default background of the distribution we -# build against -# -# WARNING WARNING WARNING -# If we ever remove the dynamic background, then the -# %{branding_name}-default-dynamic.xml file should still be shipped, as a -# symlink to %{branding_name}-default-static.xml. -# -install -d $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties $RPM_BUILD_ROOT%{_datadir}/wallpapers -ln -s %{_datadir}/backgrounds/%{dynamic_file} $RPM_BUILD_ROOT%{_datadir}/wallpapers/%{branding_name}-default-dynamic.xml -touch $RPM_BUILD_ROOT%{_datadir}/wallpapers/%{branding_name}-default.xml -# install 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 -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}-11.1-extra-gnome.xml -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 -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}-11.3-extra-gnome.xml -cp -a stripes $RPM_BUILD_ROOT%{_datadir}/backgrounds/ -# Do not install the xml file of current dynamic background for gnome-control-center; instead create one based on the static background -sed "s:%{branding_name}-default-static.xml:%{branding_name}-default-dynamic.xml:g" %{_datadir}/gnome-background-properties/wallpaper-branding-%{branding_name}.xml > $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml -###install -m0644 desktop-backgrounds-stripes.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/%{branding_name}-11.4-extra-gnome.xml -%endif # # sound theme %if %build_SLED || %build_SLES @@ -195,7 +108,6 @@ # Stuff to "Make OpenSUSE working must remain in particular packages! %define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor %define gconf_set %gconf_call --set -%define gconf_load %gconf_call --load mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" @@ -203,9 +115,6 @@ %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Define default keybinding of gnome-settings-daemon: -# FIX-OPENSUSE bnc#462640 [email protected] -- mute button always mute, instead of toggling -%gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" %gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false" %gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false" # Do not retain PK authorizations by default (bnc#431569) [email protected] @@ -251,19 +160,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %build_openSUSE - -%post -n %{branding_name}-dynamic-wallpaper -update-alternatives --install %{_datadir}/wallpapers/%{branding_name}-default.xml %{branding_name}-default.xml %{_datadir}/wallpapers/%{branding_name}-default-dynamic.xml 10 - -%postun -n %{branding_name}-dynamic-wallpaper -# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed -if [ ! -f %{_datadir}/wallpapers/%{branding_name}-default-dynamic.xml ]; then - update-alternatives --remove %{branding_name}-default.xml %{_datadir}/wallpapers/%{branding_name}-default-dynamic.xml -fi - -%endif # %%build_openSUSE - %files %defattr(-,root,root) %doc COPYING @@ -276,35 +172,6 @@ %{_datadir}/dist/icons/* %endif -%if %build_openSUSE -%files -n %{branding_name}-dynamic-wallpaper -%defattr(-,root,root) -%doc COPYING -# FIXME: Should be owned by a different package: -%dir %{_datadir}/backgrounds -%dir %{_datadir}/gnome-background-properties -%{_datadir}/backgrounds/stripes/ -%{_datadir}/gnome-background-properties/%{branding_name}-dynamic-wallpaper.xml -%dir %{_datadir}/wallpapers -%ghost %{_datadir}/wallpapers/%{branding_name}-default.xml -%{_datadir}/wallpapers/%{branding_name}-default-dynamic.xml - -%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}/gnome-background-properties/desktop-data-%{branding_name}-11.1-extra-gnome.xml -%{_datadir}/backgrounds/daft/ -%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.2-extra-gnome.xml -%{_datadir}/backgrounds/IK/ -%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.3-extra-gnome.xml -# 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) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
