Hello community,
here is the log from the commit of package gconf2-branding-openSUSE
checked in at Fri Nov 7 16:08:27 CET 2008.
--------
--- gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-04 12:27:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-07 14:41:04.000000000 +0100
@@ -1,0 +2,20 @@
+Fri Nov 7 14:34:28 CET 2008 - vuntz@novell.com
+
+- Update dynamic background for new branding. Fix bnc#442560. We
+ keep the old one for openSUSE, though (see Jakub's request in the
+ bug).
+
+-------------------------------------------------------------------
+Thu Nov 6 20:36:22 CET 2008 - vuntz@novell.com
+
+- Don't show the user list in GDM for SLED/SLES. Fix bnc#439220.
+- Add suse icons and use them in the GDM greeter. Part of
+ bnc#436431.
+- Move icons of the desktop files from gnome-session to here.
+
+-------------------------------------------------------------------
+Thu Nov 6 16:52:51 CET 2008 - hmacht@suse.de
+
+- Disable Energy Star compliant settings for openSUSE
+
+-------------------------------------------------------------------
gconf2-branding-openSUSE.changes: same change
gconf2-branding-SLED.changes: same change
gconf2-branding-SLES.changes: same change
calling whatdependson for head-i586
Old:
----
gnome-wallpaper-11.0.1.tar.bz2
New:
----
gnome-wallpaper-11.0.2.tar.bz2
gnome-wallpaper-11.1.tar.bz2
suse-help.svg
suse-icon.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gconf2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.U15954/_old 2008-11-07 16:08:02.000000000 +0100
+++ /var/tmp/diff_new_pack.U15954/_new 2008-11-07 16:08:02.000000000 +0100
@@ -42,7 +42,7 @@
Group: System/GUI/GNOME
Summary: GNOME configuration system: openSUSE defaults
Version: 2.24
-Release: 8
+Release: 9
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gconf2-branding_spec-prepare.sh
@@ -50,20 +50,23 @@
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
-Source4: gnome-wallpaper-11.0.1.tar.bz2
+Source4: gnome-wallpaper-11.0.2.tar.bz2
Source5: GnomeOnlineHelp.desktop
Source6: SuSE.desktop
+Source7: suse-icon.tar.bz2
+Source8: suse-help.svg
+Source9: gnome-wallpaper-11.1.tar.bz2
# 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
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
-Supplements: packageand(branding-openSUSE:gconf2)
+Supplements: packageand(gconf2:branding-openSUSE)
# This package provides openSUSE gnome-session splash:
Provides: gnome-session-branding = 2.20
Provides: gnome-session-branding-openSUSE = 2.20
-Supplements: packageand(branding-openSUSE:gnome-session)
+Supplements: packageand(gnome-session:branding-openSUSE)
BuildRequires: desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires: gnome-session
@@ -89,7 +92,7 @@
Summary: Dynamic Wallpaper with openSUSE Look
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 1
+Release: 2
%description -n desktop-data-openSUSE-extra-gnome
This optional package contains nice dynamic wallpaper with openSUSE
@@ -105,7 +108,7 @@
Jakub Steiner
%prep
-%setup -q -T -a4 -c %{name}-%{version}
+%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-openSUSE.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
@@ -117,14 +120,18 @@
%endif
%build
-mkdir -p grass
-cp -a *-grass-*.png grass.xml grass
%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-openSUSE.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+# current dynamic background
+cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
+%if %build_openSUSE
+# old 11.0 dynamic background
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
-install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
+install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml
+%endif
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
@@ -134,7 +141,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
-#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
+#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
@@ -147,8 +154,14 @@
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
+# Icon used on gdm greeter
+%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "suse"
+# No user list in GDM for SLED/SLES
+%if %build_SLED || %build_SLES
+%gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false"
+%endif
# Enable Energy Star compliant default configuration
-%if %build_openSUSE || %build_SLED
+%if %build_SLED
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
@@ -231,10 +244,19 @@
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
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:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
-%endif
+# 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/
+ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg
+%endif
+for size in 16 22 32 48; do
+ install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png
+done
+install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -242,11 +264,11 @@
%triggerin -- desktop-data-openSUSE-extra-gnome
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
- /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
%triggerpostun -- desktop-data-openSUSE-extra-gnome
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
-if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if ! test -f %{_datadir}/backgrounds/glass/glass.xml ; then
%if %build_openSUSE
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
/desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
@@ -259,9 +281,9 @@
%post
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
-if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if test -f %{_datadir}/backgrounds/glass/glass.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/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
fi
%files
@@ -270,24 +292,42 @@
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png
+%{_datadir}/icons/hicolor/*/*/*.*
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
+%dir %{_datadir}/dist/icons
%if %build_openSUSE
%{_datadir}/dist/desktop-files/*
+%{_datadir}/dist/icons/*
%endif
%files -n desktop-data-openSUSE-extra-gnome
%defattr(-,root,root)
%doc COPYING
-%{_datadir}/backgrounds/grass
+%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
+%if %build_openSUSE
+%{_datadir}/backgrounds/grass
+%{_datadir}/gnome-background-properties/desktop-data-openSUSE-11.0-extra-gnome.xml
+%endif
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties
%changelog
+* Fri Nov 07 2008 vuntz@novell.com
+- Update dynamic background for new branding. Fix bnc#442560. We
+ keep the old one for openSUSE, though (see Jakub's request in the
+ bug).
+* Thu Nov 06 2008 vuntz@novell.com
+- Don't show the user list in GDM for SLED/SLES. Fix bnc#439220.
+- Add suse icons and use them in the GDM greeter. Part of
+ bnc#436431.
+- Move icons of the desktop files from gnome-session to here.
+* Thu Nov 06 2008 hmacht@suse.de
+- Disable Energy Star compliant settings for openSUSE
* Tue Nov 04 2008 vuntz@novell.com
- Use the right version for desktop-data-openSUSE-extra-gnome.
Part of bnc#440849.
@@ -352,7 +392,7 @@
/apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
-* Wed Apr 30 2008 vuntz@suse.de
+* Tue Apr 29 2008 vuntz@suse.de
- Fix the path to the default background in gconf
(s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
++++++ gconf2-branding-SLED.spec ++++++
--- /var/tmp/diff_new_pack.U15954/_old 2008-11-07 16:08:02.000000000 +0100
+++ /var/tmp/diff_new_pack.U15954/_new 2008-11-07 16:08:02.000000000 +0100
@@ -42,7 +42,7 @@
Group: System/GUI/GNOME
Summary: SLED defaults for the GNOME configuration system
Version: 2.24
-Release: 8
+Release: 9
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gconf2-branding_spec-prepare.sh
@@ -50,20 +50,23 @@
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
-Source4: gnome-wallpaper-11.0.1.tar.bz2
+Source4: gnome-wallpaper-11.0.2.tar.bz2
Source5: GnomeOnlineHelp.desktop
Source6: SuSE.desktop
+Source7: suse-icon.tar.bz2
+Source8: suse-help.svg
+Source9: gnome-wallpaper-11.1.tar.bz2
# 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
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
-Supplements: packageand(branding-SLED:gconf2)
+Supplements: packageand(gconf2:branding-SLED)
# This package provides openSUSE gnome-session splash:
Provides: gnome-session-branding = 2.20
Provides: gnome-session-branding-SLED = 2.20
-Supplements: packageand(branding-SLED:gnome-session)
+Supplements: packageand(gnome-session:branding-SLED)
BuildRequires: desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires: gnome-session
@@ -89,7 +92,7 @@
Summary: SLED defaults for the GNOME configuration system
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 1
+Release: 2
%description -n desktop-data-SLED-extra-gnome
This package provides SLED defaults for configurations based on GConf
@@ -98,7 +101,7 @@
%prep
-%setup -q -T -a4 -c %{name}-%{version}
+%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-SLED.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
@@ -110,14 +113,18 @@
%endif
%build
-mkdir -p grass
-cp -a *-grass-*.png grass.xml grass
%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-SLED.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+# current dynamic background
+cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
+%if %build_openSUSE
+# old 11.0 dynamic background
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
-install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
+install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml
+%endif
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
@@ -127,7 +134,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
-#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
+#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
@@ -140,8 +147,14 @@
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
+# Icon used on gdm greeter
+%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "suse"
+# No user list in GDM for SLED/SLES
+%if %build_SLED || %build_SLES
+%gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false"
+%endif
# Enable Energy Star compliant default configuration
-%if %build_openSUSE || %build_SLED
+%if %build_SLED
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
@@ -224,10 +237,19 @@
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
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:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
-%endif
+# 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/
+ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg
+%endif
+for size in 16 22 32 48; do
+ install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png
+done
+install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -235,11 +257,11 @@
%triggerin -- desktop-data-SLED-extra-gnome
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
- /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
%triggerpostun -- desktop-data-SLED-extra-gnome
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
-if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if ! test -f %{_datadir}/backgrounds/glass/glass.xml ; then
%if %build_openSUSE
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
/desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
@@ -252,9 +274,9 @@
%post
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
-if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if test -f %{_datadir}/backgrounds/glass/glass.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/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
fi
%files
@@ -263,24 +285,42 @@
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-SLED.png
+%{_datadir}/icons/hicolor/*/*/*.*
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
+%dir %{_datadir}/dist/icons
%if %build_openSUSE
%{_datadir}/dist/desktop-files/*
+%{_datadir}/dist/icons/*
%endif
%files -n desktop-data-SLED-extra-gnome
%defattr(-,root,root)
%doc COPYING
-%{_datadir}/backgrounds/grass
+%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
+%if %build_openSUSE
+%{_datadir}/backgrounds/grass
+%{_datadir}/gnome-background-properties/desktop-data-SLED-11.0-extra-gnome.xml
+%endif
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties
%changelog
+* Fri Nov 07 2008 vuntz@novell.com
+- Update dynamic background for new branding. Fix bnc#442560. We
+ keep the old one for openSUSE, though (see Jakub's request in the
+ bug).
+* Thu Nov 06 2008 vuntz@novell.com
+- Don't show the user list in GDM for SLED/SLES. Fix bnc#439220.
+- Add suse icons and use them in the GDM greeter. Part of
+ bnc#436431.
+- Move icons of the desktop files from gnome-session to here.
+* Thu Nov 06 2008 hmacht@suse.de
+- Disable Energy Star compliant settings for openSUSE
* Tue Nov 04 2008 vuntz@novell.com
- Use the right version for desktop-data-openSUSE-extra-gnome.
Part of bnc#440849.
@@ -345,7 +385,7 @@
/apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
-* Wed Apr 30 2008 vuntz@suse.de
+* Tue Apr 29 2008 vuntz@suse.de
- Fix the path to the default background in gconf
(s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
++++++ gconf2-branding-SLES.spec ++++++
--- /var/tmp/diff_new_pack.U15954/_old 2008-11-07 16:08:02.000000000 +0100
+++ /var/tmp/diff_new_pack.U15954/_new 2008-11-07 16:08:02.000000000 +0100
@@ -42,7 +42,7 @@
Group: System/GUI/GNOME
Summary: SLES defaults for the GNOME configuration system
Version: 2.24
-Release: 8
+Release: 9
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: gconf2-branding_spec-prepare.sh
@@ -50,20 +50,23 @@
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
-Source4: gnome-wallpaper-11.0.1.tar.bz2
+Source4: gnome-wallpaper-11.0.2.tar.bz2
Source5: GnomeOnlineHelp.desktop
Source6: SuSE.desktop
+Source7: suse-icon.tar.bz2
+Source8: suse-help.svg
+Source9: gnome-wallpaper-11.1.tar.bz2
# 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
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
-Supplements: packageand(branding-SLES:gconf2)
+Supplements: packageand(gconf2:branding-SLES)
# This package provides openSUSE gnome-session splash:
Provides: gnome-session-branding = 2.20
Provides: gnome-session-branding-SLES = 2.20
-Supplements: packageand(branding-SLES:gnome-session)
+Supplements: packageand(gnome-session:branding-SLES)
BuildRequires: desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires: gnome-session
@@ -89,7 +92,7 @@
Summary: SLES defaults for the GNOME configuration system
Group: System/GUI/GNOME
Version: %{desktop_data_ver}
-Release: 1
+Release: 2
%description -n desktop-data-SLES-extra-gnome
This package provides SLES defaults for configurations based on GConf
@@ -98,7 +101,7 @@
%prep
-%setup -q -T -a4 -c %{name}-%{version}
+%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-SLES.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
@@ -110,14 +113,18 @@
%endif
%build
-mkdir -p grass
-cp -a *-grass-*.png grass.xml grass
%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-SLES.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+# current dynamic background
+cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
+%if %build_openSUSE
+# old 11.0 dynamic background
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
-install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
+install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml
+%endif
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
@@ -127,7 +134,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
-#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
+#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
@@ -140,8 +147,14 @@
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
+# Icon used on gdm greeter
+%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "suse"
+# No user list in GDM for SLED/SLES
+%if %build_SLED || %build_SLES
+%gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false"
+%endif
# Enable Energy Star compliant default configuration
-%if %build_openSUSE || %build_SLED
+%if %build_SLED
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
@@ -224,10 +237,19 @@
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
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:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
-%endif
+# 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/
+ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg
+%endif
+for size in 16 22 32 48; do
+ install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png
+done
+install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -235,11 +257,11 @@
%triggerin -- desktop-data-SLES-extra-gnome
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
- /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
%triggerpostun -- desktop-data-SLES-extra-gnome
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
-if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if ! test -f %{_datadir}/backgrounds/glass/glass.xml ; then
%if %build_openSUSE
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
/desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
@@ -252,9 +274,9 @@
%post
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
-if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if test -f %{_datadir}/backgrounds/glass/glass.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/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
fi
%files
@@ -263,24 +285,42 @@
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-SLES.png
+%{_datadir}/icons/hicolor/*/*/*.*
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
+%dir %{_datadir}/dist/icons
%if %build_openSUSE
%{_datadir}/dist/desktop-files/*
+%{_datadir}/dist/icons/*
%endif
%files -n desktop-data-SLES-extra-gnome
%defattr(-,root,root)
%doc COPYING
-%{_datadir}/backgrounds/grass
+%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
+%if %build_openSUSE
+%{_datadir}/backgrounds/grass
+%{_datadir}/gnome-background-properties/desktop-data-SLES-11.0-extra-gnome.xml
+%endif
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties
%changelog
+* Fri Nov 07 2008 vuntz@novell.com
+- Update dynamic background for new branding. Fix bnc#442560. We
+ keep the old one for openSUSE, though (see Jakub's request in the
+ bug).
+* Thu Nov 06 2008 vuntz@novell.com
+- Don't show the user list in GDM for SLED/SLES. Fix bnc#439220.
+- Add suse icons and use them in the GDM greeter. Part of
+ bnc#436431.
+- Move icons of the desktop files from gnome-session to here.
+* Thu Nov 06 2008 hmacht@suse.de
+- Disable Energy Star compliant settings for openSUSE
* Tue Nov 04 2008 vuntz@novell.com
- Use the right version for desktop-data-openSUSE-extra-gnome.
Part of bnc#440849.
@@ -345,7 +385,7 @@
/apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
-* Wed Apr 30 2008 vuntz@suse.de
+* Tue Apr 29 2008 vuntz@suse.de
- Fix the path to the default background in gconf
(s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
++++++ gconf2-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.U15954/_old 2008-11-07 16:08:02.000000000 +0100
+++ /var/tmp/diff_new_pack.U15954/_new 2008-11-07 16:08:02.000000000 +0100
@@ -50,20 +50,23 @@
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2: panel-default-setup.entries
Source3: gconf2-branding-COPYING
-Source4: gnome-wallpaper-11.0.1.tar.bz2
+Source4: gnome-wallpaper-11.0.2.tar.bz2
Source5: GnomeOnlineHelp.desktop
Source6: SuSE.desktop
+Source7: suse-icon.tar.bz2
+Source8: suse-help.svg
+Source9: gnome-wallpaper-11.1.tar.bz2
# 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
Provides: gconf2-branding = 2.20
Conflicts: otherproviders(gconf2-branding)
-Supplements: packageand(branding-%{branding_name}:gconf2)
+Supplements: packageand(gconf2:branding-%{branding_name})
# This package provides openSUSE gnome-session splash:
Provides: gnome-session-branding = 2.20
Provides: gnome-session-branding-%{branding_name} = 2.20
-Supplements: packageand(branding-%{branding_name}:gnome-session)
+Supplements: packageand(gnome-session:branding-%{branding_name})
BuildRequires: desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires: gnome-session
@@ -105,7 +108,7 @@
Jakub Steiner
%prep
-%setup -q -T -a4 -c %{name}-%{version}
+%setup -q -T -a4 -a7 -a9 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-%{branding_name}.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
@@ -117,14 +120,18 @@
%endif
%build
-mkdir -p grass
-cp -a *-grass-*.png grass.xml grass
%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-%{branding_name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
+# current dynamic background
+cp -a glass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
+install -m0644 desktop-backgrounds-glass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml
+%if %build_openSUSE
+# old 11.0 dynamic background
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}-extra-gnome.xml
+install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml
+%endif
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
@@ -134,7 +141,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
-#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
+#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
@@ -147,8 +154,14 @@
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
+# Icon used on gdm greeter
+%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "suse"
+# No user list in GDM for SLED/SLES
+%if %build_SLED || %build_SLES
+%gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false"
+%endif
# Enable Energy Star compliant default configuration
-%if %build_openSUSE || %build_SLED
+%if %build_SLED
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
@@ -231,10 +244,19 @@
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
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:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
-%endif
+# 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/
+ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg
+%endif
+for size in 16 22 32 48; do
+ install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png
+done
+install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg
%clean
rm -rf $RPM_BUILD_ROOT
@@ -242,11 +264,11 @@
%triggerin -- desktop-data-%{branding_name}-extra-gnome
# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
- /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
%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/grass/grass.xml ; then
+if ! test -f %{_datadir}/backgrounds/glass/glass.xml ; then
%if %build_openSUSE
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
/desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
@@ -259,9 +281,9 @@
%post
# If desktop-data-%{branding_name}-extra-gnome exists, we want nice dynamic background.
-if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
+if test -f %{_datadir}/backgrounds/glass/glass.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/grass/grass.xml"
+ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/glass/glass.xml"
fi
%files
@@ -270,19 +292,26 @@
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-%{branding_name}.png
+%{_datadir}/icons/hicolor/*/*/*.*
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
+%dir %{_datadir}/dist/icons
%if %build_openSUSE
%{_datadir}/dist/desktop-files/*
+%{_datadir}/dist/icons/*
%endif
%files -n desktop-data-%{branding_name}-extra-gnome
%defattr(-,root,root)
%doc COPYING
-%{_datadir}/backgrounds/grass
+%{_datadir}/backgrounds/glass
%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-extra-gnome.xml
+%if %build_openSUSE
+%{_datadir}/backgrounds/grass
+%{_datadir}/gnome-background-properties/desktop-data-%{branding_name}-11.0-extra-gnome.xml
+%endif
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties
++++++ gnome-wallpaper-11.0.1.tar.bz2 -> gnome-wallpaper-11.0.2.tar.bz2 ++++++
gconf2-branding-openSUSE/gnome-wallpaper-11.0.1.tar.bz2 /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gnome-wallpaper-11.0.2.tar.bz2 differ: byte 4, line 1
++++++ gnome-wallpaper-11.0.1.tar.bz2 -> gnome-wallpaper-11.1.tar.bz2 ++++++
gconf2-branding-openSUSE/gnome-wallpaper-11.0.1.tar.bz2 /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gnome-wallpaper-11.1.tar.bz2 differ: byte 4, line 1
++++++ SuSE.desktop ++++++
--- /var/tmp/diff_new_pack.U15954/_old 2008-11-07 16:08:03.000000000 +0100
+++ /var/tmp/diff_new_pack.U15954/_new 2008-11-07 16:08:03.000000000 +0100
@@ -3,6 +3,6 @@
Exec=ggreeter /usr/lib/ggreeter/greeter.exe
Name=openSUSE
Encoding=UTF-8
-Icon=/usr/share/dist/icons/suse.svg
+Icon=suse
OnlyShowIn=GNOME;
++++++ suse-help.svg ++++++
++++ 803 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org