diff --git a/gnome-session-2.23.91.tar.bz2 b/gnome-session-2.23.91.tar.bz2 deleted file mode 100644 index ec165de..0000000 --- a/gnome-session-2.23.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8009adf3d43e78693e87199a78462aa0d3929fdb9806cc36346a417636d730e0 -size 788716 diff --git a/gnome-session-2.23.92.tar.bz2 b/gnome-session-2.23.92.tar.bz2 new file mode 100644 index 0000000..e16f755 --- /dev/null +++ b/gnome-session-2.23.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6967128140cfa9451668637fb17dd13ec4e775ce5e64cfb3bc1256395fdea5c5 +size 809838 diff --git a/gnome-session-compiz-as-default-wm.patch b/gnome-session-compiz-as-default-wm.patch new file mode 100644 index 0000000..9652ddc --- /dev/null +++ b/gnome-session-compiz-as-default-wm.patch @@ -0,0 +1,42 @@ +Index: data/gnome-wm +=================================================================== +--- data/gnome-wm.orig ++++ data/gnome-wm +@@ -67,6 +67,12 @@ if [ -z "$WINDOW_MANAGER" ] ; then + + if [ -f "$COMPIZ_ENABLED_FILE" ] ; then + KNOWN_WM="compiz-manager $KNOWN_WM" ++ else ++ # Check to see if hardware is supported by compiz, to have it as default WM if so ++ CM_DRY=yes compiz-manager > /dev/null 2>&1 ++ if test $? -eq 0; then ++ KNOWN_WM="compiz-manager $KNOWN_WM" ++ fi + fi + + OLDIFS=$IFS +Index: data/gnome-wm.desktop.in.in +=================================================================== +--- data/gnome-wm.desktop.in.in (revision 5076) ++++ data/gnome-wm.desktop.in.in (working copy) +@@ -3,6 +3,7 @@ + Encoding=UTF-8 + _Name=Window Manager + Exec=gnome-wm ++NoDisplay=true + X-GNOME-Autostart-Phase=WindowManager + X-GNOME-Provides=windowmanager + X-GNOME-Autostart-Notify=true +Index: data/Makefile.am +=================================================================== +--- data/Makefile.am (revision 5076) ++++ data/Makefile.am (working copy) +@@ -25,6 +25,6 @@ + bin_SCRIPTS = gnome-wm + + settingsdir = $(datadir)/applications +-settings_in_files = session-properties.desktop.in ++settings_in_files = gnome-wm.desktop.in session-properties.desktop.in + settings_DATA = $(settings_in_files:.desktop.in=.desktop) + + install-data-local: \ No newline at end of file diff --git a/gnome-session.changes b/gnome-session.changes index d6476f9..d6b83a0 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Sep 11 16:06:45 CEST 2008 - rodrigo@suse.de + +- suse_update_desktop_file the gnome-wm.desktop file. +- Added Hidden=true to gnome-wm.desktop file. + +------------------------------------------------------------------- +Wed Sep 10 14:16:33 CEST 2008 - rodrigo@suse.de + +- Updated gnome-session-compiz-as-default-wm.patch to be more + correct and to include gnome-wm.desktop file in the package + +------------------------------------------------------------------- +Wed Sep 10 12:33:37 CEST 2008 - rodrigo@suse.de + +- Update to version 2.23.92: + + Make all desktop files translatable (Vincent Untz) + + Avoid gnome-wm launching itself in loop (Vincent Untz) + + Remove required components from the default session (Vincent Untz) + + Rename /desktop/gnome/session/required_components key (Vincent Untz) + + Do not use dash but underscore to separate words in gconf keys + (Vincent Untz) +- Added gnome-session-compiz-as-default-wm.patch to run compiz + as default window manager whenever possible (fate#304762) + +------------------------------------------------------------------- +Tue Sep 9 16:10:16 CEST 2008 - vuntz@novell.com + +- Add BuildRequires on PolicyKit-gnome. Fix bnc#422848. + ------------------------------------------------------------------- Thu Sep 04 16:25:49 CEST 2008 - mboman@novell.com diff --git a/gnome-session.spec b/gnome-session.spec index eca52d3..8470015 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.23.91) +# spec file for package gnome-session (Version 2.23.92) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,14 +19,15 @@ Name: gnome-session -BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel +BuildRequires: PolicyKit-gnome-devel control-center2-devel fdupes +BuildRequires: gnome-common gnome-desktop-devel BuildRequires: gnome-keyring-devel gnome-patch-translation BuildRequires: gnome-settings-daemon-devel hicolor-icon-theme intltool BuildRequires: libglade2-devel libgnomekbd libnotify-devel perl-XML-Parser BuildRequires: tcpd-devel update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME -Version: 2.23.91 +Version: 2.23.92 Release: 1 Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org @@ -55,6 +56,8 @@ Patch3: gnome-session-bgo507101-tile-ui.patch Patch4: gnome-session-gnome-wm-compiz-manager.patch #PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz@novell.com -- Improve layout with our splash screen. Patch5: gnome-session-bnc389137-splash-layout.patch +#PATCH-FEATURE-OPENSUSE gnome-session-compiz-as-default-wm.patch fate304762 rodrigo@novell.com -- Run compiz as default WM whenever possible +Patch6: gnome-session-compiz-as-default-wm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: control-center2 Obsoletes: gnome-core @@ -117,6 +120,7 @@ Authors: %patch3 -p0 %patch4 -p1 %patch5 -p1 +%patch6 -p0 #gnome-patch-translation-update %build @@ -137,6 +141,7 @@ install -m755 %SOURCE1 $RPM_BUILD_ROOT%{_bindir}/gnome install -d -m755 $RPM_BUILD_ROOT%{_datadir}/xsessions install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/ +%suse_update_desktop_file -n gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-System %find_lang %{name}-2.0 %find_gconf_schemas @@ -166,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/gnome-session/helpers %dir %{_datadir}/gnome-session %{_bindir}/* +%{_datadir}/applications/gnome-wm.desktop %{_datadir}/applications/session-properties.desktop %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* @@ -186,6 +192,24 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog +* Thu Sep 11 2008 rodrigo@suse.de +- suse_update_desktop_file the gnome-wm.desktop file. +- Added Hidden=true to gnome-wm.desktop file. +* Wed Sep 10 2008 rodrigo@suse.de +- Updated gnome-session-compiz-as-default-wm.patch to be more + correct and to include gnome-wm.desktop file in the package +* Wed Sep 10 2008 rodrigo@suse.de +- Update to version 2.23.92: + + Make all desktop files translatable (Vincent Untz) + + Avoid gnome-wm launching itself in loop (Vincent Untz) + + Remove required components from the default session (Vincent Untz) + + Rename /desktop/gnome/session/required_components key (Vincent Untz) + + Do not use dash but underscore to separate words in gconf keys + (Vincent Untz) +- Added gnome-session-compiz-as-default-wm.patch to run compiz + as default window manager whenever possible (fate#304762) +* Tue Sep 09 2008 vuntz@novell.com +- Add BuildRequires on PolicyKit-gnome. Fix bnc#422848. * Thu Sep 04 2008 mboman@novell.com - Update to version 2.23.91: + Bugs fixed: bgo#548710, bgo#548909, bgo#548980, bgo#548982,