Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Thu May 28 04:07:09 CEST 2009. -------- --- gconf2-branding-openSUSE/gconf2-branding.changes 2009-05-19 16:53:34.000000000 +0200 +++ gconf2-branding-openSUSE/gconf2-branding.changes 2009-05-25 16:43:51.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 25 16:40:50 CEST 2009 - vuntz@novell.com + +- Merge change from SLED: Add a novell sound theme, which changes + the login sound. (only for the SLE package) + +------------------------------------------------------------------- +Mon May 25 14:28:00 CEST 2009 - vuntz@novell.com + +- Replace gtk2-theme-openSUSE with gtk2-metatheme-gilouche. + +------------------------------------------------------------------- gconf2-branding-openSUSE.changes: same change gconf2-branding-SLED.changes: same change gconf2-branding-SLES.changes: same change calling whatdependson for head-i586 New: ---- novell-sound-desktop-login.ogg novell-sound-index.theme ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.R15864/_old 2009-05-28 04:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R15864/_new 2009-05-28 04:05:35.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: GNOME configuration system: openSUSE defaults Version: 2.26 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -60,6 +60,8 @@ Source7: suse-icon.tar.bz2 Source8: suse-help.svg Source9: gnome-wallpaper-11.1.tar.bz2 +Source10: novell-sound-index.theme +Source11: novell-sound-desktop-login.ogg # 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: @@ -79,12 +81,17 @@ #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. -# Referenced icon theme Gilouche is part of gtk2-theme-openSUSE: -Requires: gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = %{desktop_data_ver} +Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} +# Icon theme +Requires: gtk2-metatheme-gilouche # Metacity and gtk+ theme Requires: gtk2-metatheme-sonar # Window title font Requires: fifth-leg-font +%if %build_SLED || %build_SLES +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop +%endif Suggests: desktop-data-openSUSE-extra-gnome %description @@ -100,7 +107,7 @@ Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 20 +Release: 21 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -138,6 +145,12 @@ 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 %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 +%endif # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -223,6 +236,9 @@ # Enable sound events by default in libgnome: %gconf_set /desktop/gnome/sound/enable_esd --type=bool "false" %gconf_set /desktop/gnome/sound/event_sounds --type=bool "true" +%if %build_SLED || %build_SLES +%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" +%endif # Disable audible bell in metacity: %gconf_set /apps/metacity/general/audible_bell --type=bool "false" %if %build_SLED || %build_SLES @@ -313,6 +329,9 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif +%if %build_SLED || %build_SLES +%{_datadir}/sounds/novell +%endif %files -n desktop-data-openSUSE-extra-gnome %defattr(-,root,root) @@ -328,6 +347,11 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Mon May 25 2009 vuntz@novell.com +- Merge change from SLED: Add a novell sound theme, which changes + the login sound. (only for the SLE package) +* Mon May 25 2009 vuntz@novell.com +- Replace gtk2-theme-openSUSE with gtk2-metatheme-gilouche. * Tue May 19 2009 vuntz@novell.com - Change default gtk+ and metacity theme to Sonar. - Change default metacity font to FifthLeg Bold 12. ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.R15864/_old 2009-05-28 04:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R15864/_new 2009-05-28 04:05:35.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.26 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -60,6 +60,8 @@ Source7: suse-icon.tar.bz2 Source8: suse-help.svg Source9: gnome-wallpaper-11.1.tar.bz2 +Source10: novell-sound-index.theme +Source11: novell-sound-desktop-login.ogg # 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: @@ -79,12 +81,17 @@ #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. -# Referenced icon theme Gilouche is part of gtk2-theme-openSUSE: -Requires: gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = %{desktop_data_ver} +Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} +# Icon theme +Requires: gtk2-metatheme-gilouche # Metacity and gtk+ theme Requires: gtk2-metatheme-sonar # Window title font Requires: fifth-leg-font +%if %build_SLED || %build_SLES +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop +%endif Suggests: desktop-data-SLED-extra-gnome %description @@ -100,7 +107,7 @@ Summary: SLED defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 20 +Release: 21 %description -n desktop-data-SLED-extra-gnome This package provides SLED defaults for configurations based on GConf @@ -131,6 +138,12 @@ 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 %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 +%endif # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -216,6 +229,9 @@ # Enable sound events by default in libgnome: %gconf_set /desktop/gnome/sound/enable_esd --type=bool "false" %gconf_set /desktop/gnome/sound/event_sounds --type=bool "true" +%if %build_SLED || %build_SLES +%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" +%endif # Disable audible bell in metacity: %gconf_set /apps/metacity/general/audible_bell --type=bool "false" %if %build_SLED || %build_SLES @@ -306,6 +322,9 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif +%if %build_SLED || %build_SLES +%{_datadir}/sounds/novell +%endif %files -n desktop-data-SLED-extra-gnome %defattr(-,root,root) @@ -321,6 +340,11 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Mon May 25 2009 vuntz@novell.com +- Merge change from SLED: Add a novell sound theme, which changes + the login sound. (only for the SLE package) +* Mon May 25 2009 vuntz@novell.com +- Replace gtk2-theme-openSUSE with gtk2-metatheme-gilouche. * Tue May 19 2009 vuntz@novell.com - Change default gtk+ and metacity theme to Sonar. - Change default metacity font to FifthLeg Bold 12. ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.R15864/_old 2009-05-28 04:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R15864/_new 2009-05-28 04:05:35.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.26 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -60,6 +60,8 @@ Source7: suse-icon.tar.bz2 Source8: suse-help.svg Source9: gnome-wallpaper-11.1.tar.bz2 +Source10: novell-sound-index.theme +Source11: novell-sound-desktop-login.ogg # 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: @@ -79,12 +81,17 @@ #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. -# Referenced icon theme Gilouche is part of gtk2-theme-openSUSE: -Requires: gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = %{desktop_data_ver} +Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} +# Icon theme +Requires: gtk2-metatheme-gilouche # Metacity and gtk+ theme Requires: gtk2-metatheme-sonar # Window title font Requires: fifth-leg-font +%if %build_SLED || %build_SLES +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop +%endif Suggests: desktop-data-SLES-extra-gnome %description @@ -100,7 +107,7 @@ Summary: SLES defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 20 +Release: 21 %description -n desktop-data-SLES-extra-gnome This package provides SLES defaults for configurations based on GConf @@ -131,6 +138,12 @@ 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 %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 +%endif # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -216,6 +229,9 @@ # Enable sound events by default in libgnome: %gconf_set /desktop/gnome/sound/enable_esd --type=bool "false" %gconf_set /desktop/gnome/sound/event_sounds --type=bool "true" +%if %build_SLED || %build_SLES +%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" +%endif # Disable audible bell in metacity: %gconf_set /apps/metacity/general/audible_bell --type=bool "false" %if %build_SLED || %build_SLES @@ -306,6 +322,9 @@ %{_datadir}/dist/desktop-files/* %{_datadir}/dist/icons/* %endif +%if %build_SLED || %build_SLES +%{_datadir}/sounds/novell +%endif %files -n desktop-data-SLES-extra-gnome %defattr(-,root,root) @@ -321,6 +340,11 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Mon May 25 2009 vuntz@novell.com +- Merge change from SLED: Add a novell sound theme, which changes + the login sound. (only for the SLE package) +* Mon May 25 2009 vuntz@novell.com +- Replace gtk2-theme-openSUSE with gtk2-metatheme-gilouche. * Tue May 19 2009 vuntz@novell.com - Change default gtk+ and metacity theme to Sonar. - Change default metacity font to FifthLeg Bold 12. ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.R15864/_old 2009-05-28 04:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R15864/_new 2009-05-28 04:05:35.000000000 +0200 @@ -60,6 +60,8 @@ Source7: suse-icon.tar.bz2 Source8: suse-help.svg Source9: gnome-wallpaper-11.1.tar.bz2 +Source10: novell-sound-index.theme +Source11: novell-sound-desktop-login.ogg # 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: @@ -79,12 +81,17 @@ #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using #BRAND: gconf schemas. All referenced files must be present in this #BRAND: package or in required packages. -# Referenced icon theme Gilouche is part of gtk2-theme-openSUSE: -Requires: gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = %{desktop_data_ver} +Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} +# Icon theme +Requires: gtk2-metatheme-gilouche # Metacity and gtk+ theme Requires: gtk2-metatheme-sonar # Window title font Requires: fifth-leg-font +%if %build_SLED || %build_SLES +# the sound theme inherits from the freedesktop one +Requires: sound-theme-freedesktop +%endif Suggests: desktop-data-%{branding_name}-extra-gnome %description @@ -138,6 +145,12 @@ 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 %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 +%endif # http://en.opensuse.org/GNOME/Projects/SchemasChanges # Only vendor preferences are allowed here. # Stuff to "Make OpenSUSE working must remain in particular packages! @@ -223,6 +236,9 @@ # Enable sound events by default in libgnome: %gconf_set /desktop/gnome/sound/enable_esd --type=bool "false" %gconf_set /desktop/gnome/sound/event_sounds --type=bool "true" +%if %build_SLED || %build_SLES +%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" +%endif # Disable audible bell in metacity: %gconf_set /apps/metacity/general/audible_bell --type=bool "false" %if %build_SLED || %build_SLES @@ -313,6 +329,9 @@ %{_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 %defattr(-,root,root) ++++++ novell-sound-index.theme ++++++ [Sound Theme] Name=Novell Directories=stereo Inherits=freedesktop [stereo] OutputProfile=stereo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org