From fc49a8570be35fa4e1ca38af7466f3fee0c10d79b764f4eef5faba23f2d4e59d Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 1 Dec 2009 15:11:19 +0000 Subject: [PATCH 1/8] Accepting request 25318 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 25318 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/25318 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=74 --- gnome-session.changes | 11 ++++++++++ gnome-session.spec | 50 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index abdd29f..b60671b 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org + +- Split the gnome-settings-daemon helper into a gtk1-support + subpackage, that will only gets installed if gtk1 is installed. + This should remove some unneeded cruft on login for most people. +- Add --enable-splash configure option, and ship the splash screen + in a splash subpackage. +- Fix rpmlint warning about self-obsoletion. +- Fix license: it's GPLv2+ and not "GPLv2+;LGPLv2.1+". + ------------------------------------------------------------------- Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 898425d..e193bf0 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -20,7 +20,7 @@ Name: gnome-session Version: 2.28.0 Release: 2 -License: GPL v2 or later ; LGPL v2.1 or later +License: GPL v2 or later Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Group: System/GUI/GNOME @@ -65,7 +65,7 @@ Requires: nautilus Obsoletes: gnome-core # There's no splash anymore, so no branding package. Provides: %{name}-branding = %{version} -Obsoletes: %{name}-branding <= %{version} +Obsoletes: %{name}-branding < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -73,6 +73,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package provides the basic session tools, like session management functionality, for the GNOME 2.x Desktop. +%package gtk1-support +License: GPL v2 or later +Summary: GTK+ 1.x compatibility layer for gnome-session +Requires: %{name} = %{version} +Supplements: packageand(gnome-session:gtk) + +%description gtk1-support +This helper makes GTK+ 1.x applications feel more integrated in +modern GNOME desktops, by setting the GTK_RC_FILES environment +variable during the GNOME session initialization. + +%package splash +License: GPL v2 or later +Summary: Splash screen for gnome-session +Requires: %{name} = %{version} + +%description splash +The splash screen is displayed to indicate that the GNOME session +is loading. It is not installed by default because the GNOME +session is considered to start fast enough. + %lang_package %prep %setup -q @@ -89,7 +110,8 @@ gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh %configure \ - --with-default-wm=gnome-wm + --with-default-wm=gnome-wm \ + --enable-splash %__make %{?jobs:-j%jobs} %install @@ -101,15 +123,13 @@ install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +%suse_update_desktop_file gnome-session-splash %suse_update_desktop_file gnome-settings-daemon-helper %suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-System %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-2.0 %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst -# Temporary workaround: still installed by the package -rm -f %{buildroot}%{_datadir}/pixmaps/splash/gnome-splash.png %fdupes %{buildroot} %clean @@ -121,7 +141,7 @@ rm -rf %{buildroot} %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* @@ -129,9 +149,23 @@ rm -rf %{buildroot} %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop -%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* +# Exclude files shipped in other subpackages +%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper +%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash + +%files gtk1-support +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop +%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper + +%files splash +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop +%{_libdir}/gnome-session/helpers/gnome-session-splash +%dir %{_datadir}/pixmaps/splash +%{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang ## ha/ig does not exist in Factory currently From 25ed225acb193a69c6c5264a46c0e5ca87ab3b1e3229d020ec1a7179c33ef740 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:50:51 +0000 Subject: [PATCH 2/8] Accepting request 25375 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 25375 revision 3. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25375 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=75 --- gnome-session.changes | 6 ++++++ gnome-session.spec | 11 ++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index b60671b..1df3cdf 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha/ig locales for old versions of + openSUSE. + ------------------------------------------------------------------- Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index e193bf0..4ca13a7 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -116,7 +116,10 @@ NOCONFIGURE=1 gnome-autogen.sh %install %makeinstall -# +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome @@ -168,11 +171,5 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang -## ha/ig does not exist in Factory currently -##%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -##%endif %changelog From 3316bd1d056a6eaf3c4ec4c366abe3f61b2730d3c3838760c7f9d20c9473efbb Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 4 Dec 2009 22:47:25 +0000 Subject: [PATCH 3/8] Accepting request 25658 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 25658 revision 2. Request was accepted with message: Accepting OBS-URL: https://build.opensuse.org/request/show/25658 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=76 --- gnome-session.changes | 6 ++++++ gnome-session.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/gnome-session.changes b/gnome-session.changes index 1df3cdf..5ade08c 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org + +- Add Requires on gconf-sanity-check, which was split from the main + gconf2 package. + ------------------------------------------------------------------- Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 4ca13a7..722e353 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -54,6 +54,7 @@ BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Requires: ConsoleKit Requires: dbus-1-x11 +Requires: gconf-sanity-check Requires: hicolor-icon-theme # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and From 5890cc5d4ddf644b5e17703cebf0400f26346e380d2a77251a747376f055bdac Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 5 Dec 2009 01:10:19 +0000 Subject: [PATCH 4/8] Accepting request 25667 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 25667 revision 2. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/25667 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=77 --- gnome-session.changes | 4 ++-- gnome-session.spec | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index 5ade08c..863e1ea 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org -- Add Requires on gconf-sanity-check, which was split from the main - gconf2 package. +- Add BuildRequires and Requires on gconf-sanity-check, which was + split from the main gconf2 package. ------------------------------------------------------------------- Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 722e353..f70a69b 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -43,6 +43,7 @@ Patch4: gnome-session-enable-disable-compiz.patch Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes +BuildRequires: gconf-sanity-check BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation From 4654cdeb3f58eb43abdb584b03468eb113d3ce7dcee408cf7ac2ea3742ffbadd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 09:40:39 +0000 Subject: [PATCH 5/8] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=78 --- gnome-session.changes | 23 ---------------- gnome-session.spec | 63 +++++++++++-------------------------------- 2 files changed, 15 insertions(+), 71 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index 863e1ea..abdd29f 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org - -- Add BuildRequires and Requires on gconf-sanity-check, which was - split from the main gconf2 package. - -------------------------------------------------------------------- -Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org - -- Update the way we remove the ha/ig locales for old versions of - openSUSE. - -------------------------------------------------------------------- -Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org - -- Split the gnome-settings-daemon helper into a gtk1-support - subpackage, that will only gets installed if gtk1 is installed. - This should remove some unneeded cruft on login for most people. -- Add --enable-splash configure option, and ship the splash screen - in a splash subpackage. -- Fix rpmlint warning about self-obsoletion. -- Fix license: it's GPLv2+ and not "GPLv2+;LGPLv2.1+". - ------------------------------------------------------------------- Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index f70a69b..898425d 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -20,7 +20,7 @@ Name: gnome-session Version: 2.28.0 Release: 2 -License: GPL v2 or later +License: GPL v2 or later ; LGPL v2.1 or later Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Group: System/GUI/GNOME @@ -43,7 +43,6 @@ Patch4: gnome-session-enable-disable-compiz.patch Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes -BuildRequires: gconf-sanity-check BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation @@ -55,7 +54,6 @@ BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Requires: ConsoleKit Requires: dbus-1-x11 -Requires: gconf-sanity-check Requires: hicolor-icon-theme # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and @@ -67,7 +65,7 @@ Requires: nautilus Obsoletes: gnome-core # There's no splash anymore, so no branding package. Provides: %{name}-branding = %{version} -Obsoletes: %{name}-branding < %{version} +Obsoletes: %{name}-branding <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -75,27 +73,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package provides the basic session tools, like session management functionality, for the GNOME 2.x Desktop. -%package gtk1-support -License: GPL v2 or later -Summary: GTK+ 1.x compatibility layer for gnome-session -Requires: %{name} = %{version} -Supplements: packageand(gnome-session:gtk) - -%description gtk1-support -This helper makes GTK+ 1.x applications feel more integrated in -modern GNOME desktops, by setting the GTK_RC_FILES environment -variable during the GNOME session initialization. - -%package splash -License: GPL v2 or later -Summary: Splash screen for gnome-session -Requires: %{name} = %{version} - -%description splash -The splash screen is displayed to indicate that the GNOME session -is loading. It is not installed by default because the GNOME -session is considered to start fast enough. - %lang_package %prep %setup -q @@ -112,29 +89,27 @@ gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh %configure \ - --with-default-wm=gnome-wm \ - --enable-splash + --with-default-wm=gnome-wm %__make %{?jobs:-j%jobs} %install %makeinstall -%if 0%{?suse_version} <= 1110 -%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* -%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* -%endif +# # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -%suse_update_desktop_file gnome-session-splash %suse_update_desktop_file gnome-settings-daemon-helper %suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-System %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-2.0 %find_gconf_schemas +cat %{name}.schemas_list >%{name}.lst +# Temporary workaround: still installed by the package +rm -f %{buildroot}%{_datadir}/pixmaps/splash/gnome-splash.png %fdupes %{buildroot} %clean @@ -146,7 +121,7 @@ rm -rf %{buildroot} %preun -f %{name}.schemas_preun -%files -f %{name}.schemas_list +%files -f %{name}.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* @@ -154,24 +129,16 @@ rm -rf %{buildroot} %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop +%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* -# Exclude files shipped in other subpackages -%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper -%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash - -%files gtk1-support -%defattr (-, root, root) -%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop -%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper - -%files splash -%defattr (-, root, root) -%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop -%{_libdir}/gnome-session/helpers/gnome-session-splash -%dir %{_datadir}/pixmaps/splash -%{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang +## ha/ig does not exist in Factory currently +##%if %suse_version <= 1110 +# exclude locales which don't exist on old versions of openSUSE +%exclude %{_datadir}/locale/ha/LC_MESSAGES/* +%exclude %{_datadir}/locale/ig/LC_MESSAGES/* +##%endif %changelog From f23207d0421858650fee3d13613d03d7efc9c6eca0e4ebb505875127dcdfabe0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Jan 2010 00:01:13 +0000 Subject: [PATCH 6/8] Accepting request 30615 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 30615 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/30615 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=79 --- gnome-session-2.28.0.tar.bz2 | 3 - gnome-session-2.29.6.tar.bz2 | 3 + gnome-session-bgo507101-tile-ui.patch | 5 +- gnome-session-fix-capplet-saving.patch | 24 -------- gnome-session.changes | 41 ++++++++++++++ gnome-session.spec | 77 ++++++++++++++++++-------- 6 files changed, 101 insertions(+), 52 deletions(-) delete mode 100644 gnome-session-2.28.0.tar.bz2 create mode 100644 gnome-session-2.29.6.tar.bz2 delete mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-2.28.0.tar.bz2 b/gnome-session-2.28.0.tar.bz2 deleted file mode 100644 index 4e8ad64..0000000 --- a/gnome-session-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c -size 822009 diff --git a/gnome-session-2.29.6.tar.bz2 b/gnome-session-2.29.6.tar.bz2 new file mode 100644 index 0000000..98e6430 --- /dev/null +++ b/gnome-session-2.29.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:181b47360f2b2e16e233bcc250d079b845c4a2656298309fea284a05be6438f3 +size 827510 diff --git a/gnome-session-bgo507101-tile-ui.patch b/gnome-session-bgo507101-tile-ui.patch index da2082b..c31ec46 100644 --- a/gnome-session-bgo507101-tile-ui.patch +++ b/gnome-session-bgo507101-tile-ui.patch @@ -542,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -367,84 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -690,8 +690,7 @@ Index: gnome-session/gsm-logout-dialog.c + gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); - gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); -- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label), -- primary_text); +- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); + gtk_window_set_title (GTK_WINDOW (logout_dialog), title); + gtk_window_set_position (GTK_WINDOW (logout_dialog), + GTK_WIN_POS_CENTER_ALWAYS); diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch deleted file mode 100644 index ae1bbff..0000000 --- a/gnome-session-fix-capplet-saving.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit dd9df169196441717498ac09ee8c437fb552116e -Author: Vincent Untz -Date: Sun Oct 11 16:32:53 2009 -0400 - - [capplet] Destroy the main window on close to ensure changes are saved - - For some reasons, sometimes it works, and sometimes it doesn't. By - destroying the window, we make sure all objects are disposed and the - changes are saved. - - https://bugzilla.gnome.org/show_bug.cgi?id=597623 - -diff --git a/capplet/main.c b/capplet/main.c -index c8829a0..861e36a 100644 ---- a/capplet/main.c -+++ b/capplet/main.c -@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, - gtk_widget_destroy (d); - } - } else { -+ gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_main_quit (); - } - } diff --git a/gnome-session.changes b/gnome-session.changes index abdd29f..964cb31 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Jan 27 17:16:25 CET 2010 - vuntz@opensuse.org + +- Update to version 2.29.6: + + Session Manager: + - Fix typo in error message + - Add diagnostic output for exit phase timeout + - GSeal: Use accessor functions instead of direct access + - Check that the XSMP connection exists when stopping a client + to fix potential crash on exit + + Capplet: + - Destroy the main window on close to ensure changes are saved + + Misc: + - Install the helpers in libexecdir, not libdir +- Rebase gnome-session-bgo507101-tile-ui.patch. +- Drop gnome-session-fix-capplet-saving.patch: fixed upstream. +- Remove en@shaw translation on openSUSE 11.2 and earlier. + +------------------------------------------------------------------- +Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org + +- Add BuildRequires and Requires on gconf-sanity-check, which was + split from the main gconf2 package. + +------------------------------------------------------------------- +Wed Dec 2 11:55:47 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha/ig locales for old versions of + openSUSE. + +------------------------------------------------------------------- +Tue Dec 1 15:21:51 CET 2009 - vuntz@opensuse.org + +- Split the gnome-settings-daemon helper into a gtk1-support + subpackage, that will only gets installed if gtk1 is installed. + This should remove some unneeded cruft on login for most people. +- Add --enable-splash configure option, and ship the splash screen + in a splash subpackage. +- Fix rpmlint warning about self-obsoletion. +- Fix license: it's GPLv2+ and not "GPLv2+;LGPLv2.1+". + ------------------------------------------------------------------- Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 898425d..cb7bd93 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.28.0) +# spec file for package gnome-session (Version 2.29.6) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: gnome-session -Version: 2.28.0 -Release: 2 -License: GPL v2 or later ; LGPL v2.1 or later +Version: 2.29.6 +Release: 1 +License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Group: System/GUI/GNOME @@ -39,10 +39,9 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch -# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream -Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes +BuildRequires: gconf-sanity-check BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation @@ -54,6 +53,7 @@ BuildRequires: update-desktop-files Requires: %{name}-lang = %{version} Requires: ConsoleKit Requires: dbus-1-x11 +Requires: gconf-sanity-check Requires: hicolor-icon-theme # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and @@ -65,7 +65,7 @@ Requires: nautilus Obsoletes: gnome-core # There's no splash anymore, so no branding package. Provides: %{name}-branding = %{version} -Obsoletes: %{name}-branding <= %{version} +Obsoletes: %{name}-branding < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -73,6 +73,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package provides the basic session tools, like session management functionality, for the GNOME 2.x Desktop. +%package gtk1-support +License: GPLv2+ +Summary: GTK+ 1.x compatibility layer for gnome-session +Requires: %{name} = %{version} +Supplements: packageand(gnome-session:gtk) + +%description gtk1-support +This helper makes GTK+ 1.x applications feel more integrated in +modern GNOME desktops, by setting the GTK_RC_FILES environment +variable during the GNOME session initialization. + +%package splash +License: GPLv2+ +Summary: Splash screen for gnome-session +Requires: %{name} = %{version} + +%description splash +The splash screen is displayed to indicate that the GNOME session +is loading. It is not installed by default because the GNOME +session is considered to start fast enough. + %lang_package %prep %setup -q @@ -83,33 +104,37 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh %configure \ - --with-default-wm=gnome-wm + --with-default-wm=gnome-wm \ + --enable-splash %__make %{?jobs:-j%jobs} %install %makeinstall -# +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +%suse_update_desktop_file gnome-session-splash %suse_update_desktop_file gnome-settings-daemon-helper %suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-System %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-2.0 %find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst -# Temporary workaround: still installed by the package -rm -f %{buildroot}%{_datadir}/pixmaps/splash/gnome-splash.png %fdupes %{buildroot} %clean @@ -121,24 +146,32 @@ rm -rf %{buildroot} %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%files -f %{name}.schemas_list %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* -%{_libdir}/gnome-session +%{_libexecdir}/gnome-session %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop -%{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* +# Exclude files shipped in other subpackages +%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper +%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash + +%files gtk1-support +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop +%{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper + +%files splash +%defattr (-, root, root) +%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop +%{_libexecdir}/gnome-session/helpers/gnome-session-splash +%dir %{_datadir}/pixmaps/splash +%{_datadir}/pixmaps/splash/gnome-splash.png %files lang -f %{name}-2.0.lang -## ha/ig does not exist in Factory currently -##%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -##%endif %changelog From 6ddac8fbb0d90abee55330433e4377e608d50a2659ec145d046574c02b19a985 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 11 Feb 2010 19:31:58 +0000 Subject: [PATCH 7/8] checked in (request 32267) OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=80 --- gnome-session-2.28.0.tar.bz2 | 3 +++ gnome-session-2.29.6.tar.bz2 | 3 --- gnome-session-bgo507101-tile-ui.patch | 5 +++-- gnome-session-fix-capplet-saving.patch | 24 ++++++++++++++++++++++++ gnome-session.changes | 18 ------------------ gnome-session.spec | 22 +++++++++++----------- 6 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 gnome-session-2.28.0.tar.bz2 delete mode 100644 gnome-session-2.29.6.tar.bz2 create mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-2.28.0.tar.bz2 b/gnome-session-2.28.0.tar.bz2 new file mode 100644 index 0000000..4e8ad64 --- /dev/null +++ b/gnome-session-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c +size 822009 diff --git a/gnome-session-2.29.6.tar.bz2 b/gnome-session-2.29.6.tar.bz2 deleted file mode 100644 index 98e6430..0000000 --- a/gnome-session-2.29.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:181b47360f2b2e16e233bcc250d079b845c4a2656298309fea284a05be6438f3 -size 827510 diff --git a/gnome-session-bgo507101-tile-ui.patch b/gnome-session-bgo507101-tile-ui.patch index c31ec46..da2082b 100644 --- a/gnome-session-bgo507101-tile-ui.patch +++ b/gnome-session-bgo507101-tile-ui.patch @@ -542,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -367,84 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -690,7 +690,8 @@ Index: gnome-session/gsm-logout-dialog.c + gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); - gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); -- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); +- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label), +- primary_text); + gtk_window_set_title (GTK_WINDOW (logout_dialog), title); + gtk_window_set_position (GTK_WINDOW (logout_dialog), + GTK_WIN_POS_CENTER_ALWAYS); diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch new file mode 100644 index 0000000..ae1bbff --- /dev/null +++ b/gnome-session-fix-capplet-saving.patch @@ -0,0 +1,24 @@ +commit dd9df169196441717498ac09ee8c437fb552116e +Author: Vincent Untz +Date: Sun Oct 11 16:32:53 2009 -0400 + + [capplet] Destroy the main window on close to ensure changes are saved + + For some reasons, sometimes it works, and sometimes it doesn't. By + destroying the window, we make sure all objects are disposed and the + changes are saved. + + https://bugzilla.gnome.org/show_bug.cgi?id=597623 + +diff --git a/capplet/main.c b/capplet/main.c +index c8829a0..861e36a 100644 +--- a/capplet/main.c ++++ b/capplet/main.c +@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, + gtk_widget_destroy (d); + } + } else { ++ gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_main_quit (); + } + } diff --git a/gnome-session.changes b/gnome-session.changes index 964cb31..863e1ea 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,21 +1,3 @@ -------------------------------------------------------------------- -Wed Jan 27 17:16:25 CET 2010 - vuntz@opensuse.org - -- Update to version 2.29.6: - + Session Manager: - - Fix typo in error message - - Add diagnostic output for exit phase timeout - - GSeal: Use accessor functions instead of direct access - - Check that the XSMP connection exists when stopping a client - to fix potential crash on exit - + Capplet: - - Destroy the main window on close to ensure changes are saved - + Misc: - - Install the helpers in libexecdir, not libdir -- Rebase gnome-session-bgo507101-tile-ui.patch. -- Drop gnome-session-fix-capplet-saving.patch: fixed upstream. -- Remove en@shaw translation on openSUSE 11.2 and earlier. - ------------------------------------------------------------------- Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index cb7bd93..b884279 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.29.6) +# spec file for package gnome-session (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: gnome-session -Version: 2.29.6 -Release: 1 +Version: 2.28.0 +Release: 3 License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org @@ -39,6 +39,8 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch +# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream +Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes BuildRequires: gconf-sanity-check @@ -104,6 +106,7 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build @@ -119,9 +122,6 @@ NOCONFIGURE=1 gnome-autogen.sh %{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* %endif -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome @@ -150,25 +150,25 @@ rm -rf %{buildroot} %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* -%{_libexecdir}/gnome-session +%{_libdir}/gnome-session %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* # Exclude files shipped in other subpackages -%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper -%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash +%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper +%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash %files gtk1-support %defattr (-, root, root) %{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop -%{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper +%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper %files splash %defattr (-, root, root) %{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop -%{_libexecdir}/gnome-session/helpers/gnome-session-splash +%{_libdir}/gnome-session/helpers/gnome-session-splash %dir %{_datadir}/pixmaps/splash %{_datadir}/pixmaps/splash/gnome-splash.png From 16aec9ab3c14359a5d71d4106d12413893f7a405ddbd71d488d5457ba8545572 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 19:31:59 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/gnome-session revision 87.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=23a63570602f54d8af398b89040df257 --- gnome-session-2.28.0.tar.bz2 | 3 --- gnome-session-2.29.6.tar.bz2 | 3 +++ gnome-session-bgo507101-tile-ui.patch | 5 ++--- gnome-session-fix-capplet-saving.patch | 24 ------------------------ gnome-session.changes | 18 ++++++++++++++++++ gnome-session.spec | 24 ++++++++++++------------ 6 files changed, 35 insertions(+), 42 deletions(-) delete mode 100644 gnome-session-2.28.0.tar.bz2 create mode 100644 gnome-session-2.29.6.tar.bz2 delete mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-2.28.0.tar.bz2 b/gnome-session-2.28.0.tar.bz2 deleted file mode 100644 index 4e8ad64..0000000 --- a/gnome-session-2.28.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c -size 822009 diff --git a/gnome-session-2.29.6.tar.bz2 b/gnome-session-2.29.6.tar.bz2 new file mode 100644 index 0000000..98e6430 --- /dev/null +++ b/gnome-session-2.29.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:181b47360f2b2e16e233bcc250d079b845c4a2656298309fea284a05be6438f3 +size 827510 diff --git a/gnome-session-bgo507101-tile-ui.patch b/gnome-session-bgo507101-tile-ui.patch index da2082b..c31ec46 100644 --- a/gnome-session-bgo507101-tile-ui.patch +++ b/gnome-session-bgo507101-tile-ui.patch @@ -542,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -367,84 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -690,8 +690,7 @@ Index: gnome-session/gsm-logout-dialog.c + gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); - gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); -- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label), -- primary_text); +- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); + gtk_window_set_title (GTK_WINDOW (logout_dialog), title); + gtk_window_set_position (GTK_WINDOW (logout_dialog), + GTK_WIN_POS_CENTER_ALWAYS); diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch deleted file mode 100644 index ae1bbff..0000000 --- a/gnome-session-fix-capplet-saving.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit dd9df169196441717498ac09ee8c437fb552116e -Author: Vincent Untz -Date: Sun Oct 11 16:32:53 2009 -0400 - - [capplet] Destroy the main window on close to ensure changes are saved - - For some reasons, sometimes it works, and sometimes it doesn't. By - destroying the window, we make sure all objects are disposed and the - changes are saved. - - https://bugzilla.gnome.org/show_bug.cgi?id=597623 - -diff --git a/capplet/main.c b/capplet/main.c -index c8829a0..861e36a 100644 ---- a/capplet/main.c -+++ b/capplet/main.c -@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, - gtk_widget_destroy (d); - } - } else { -+ gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_main_quit (); - } - } diff --git a/gnome-session.changes b/gnome-session.changes index 863e1ea..964cb31 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jan 27 17:16:25 CET 2010 - vuntz@opensuse.org + +- Update to version 2.29.6: + + Session Manager: + - Fix typo in error message + - Add diagnostic output for exit phase timeout + - GSeal: Use accessor functions instead of direct access + - Check that the XSMP connection exists when stopping a client + to fix potential crash on exit + + Capplet: + - Destroy the main window on close to ensure changes are saved + + Misc: + - Install the helpers in libexecdir, not libdir +- Rebase gnome-session-bgo507101-tile-ui.patch. +- Drop gnome-session-fix-capplet-saving.patch: fixed upstream. +- Remove en@shaw translation on openSUSE 11.2 and earlier. + ------------------------------------------------------------------- Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index b884279..18aa813 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,7 +1,7 @@ # -# spec file for package gnome-session (Version 2.28.0) +# spec file for package gnome-session (Version 2.29.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,8 @@ Name: gnome-session -Version: 2.28.0 -Release: 3 +Version: 2.29.6 +Release: 1 License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org @@ -39,8 +39,6 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch -# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream -Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes BuildRequires: gconf-sanity-check @@ -106,7 +104,6 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 gnome-patch-translation-update %build @@ -122,6 +119,9 @@ NOCONFIGURE=1 gnome-autogen.sh %{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* %{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* %endif +%if 0%{?suse_version} <= 1120 +%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +%endif # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome @@ -150,25 +150,25 @@ rm -rf %{buildroot} %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/* -%{_libdir}/gnome-session +%{_libexecdir}/gnome-session %{_datadir}/gnome-session %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop %{_datadir}/icons/hicolor/*/*/*.* %doc %{_mandir}/man?/*.* # Exclude files shipped in other subpackages -%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper -%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash +%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper +%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash %files gtk1-support %defattr (-, root, root) %{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop -%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper +%{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper %files splash %defattr (-, root, root) %{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop -%{_libdir}/gnome-session/helpers/gnome-session-splash +%{_libexecdir}/gnome-session/helpers/gnome-session-splash %dir %{_datadir}/pixmaps/splash %{_datadir}/pixmaps/splash/gnome-splash.png