Accepting request 75177 from home:vuntz:branches:GNOME:Factory

Split session definitions, to make gnome-shell gets installed; fixed .changes

OBS-URL: https://build.opensuse.org/request/show/75177
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=113

gnome-session.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Jul  2 11:37:00 CEST 2011 - vuntz@opensuse.org
+
+- Split out default-session and fallback-session subpackages, that
+  contain the definitions of the upstream default and fallback
+  sessions for GNOME. They have Requires matching the session
+  definitions.
+- Note that we have a fallback-session Recommends in
+  default-session, since by definition, the default session could
+  fallback to the fallback session. We use a Recommends instead of
+  a Requires, since people might want to remove it.
+- Remove gnome-panel, gnome-settings-daemon, metacity, nautilus,
+  notification-daemon Requires for the main package, as those were
+  only used to define the GNOME session. Instead, add a Requires on
+  the default-session subpackage.
+- Move the gnome-session-check-accelerated and
+  gnome-session-check-accelerated-helper tools to the core
+  subpackage, as session definitions might use those helpers.
+- As a side-effect, these changes should fix bnc#697574.
+
 -------------------------------------------------------------------
 Tue Jun 14 14:42:30 CEST 2011 - dimstar@opensuse.org
 

gnome-session.spec

@@ -61,14 +61,7 @@ BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xtst)
 Requires:       %{name}-core = %{version}
-# 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
-# give the impression that it's broken)
-Requires:       gnome-panel
-Requires:       gnome-settings-daemon
-Requires:       metacity
-Requires:       nautilus
-Requires:       notification-daemon
+Requires:       %{name}-default-session = %{version}
 Recommends:     %{name}-lang
 Obsoletes:      gnome-core
 # There's no splash anymore, so no branding package.
@@ -83,6 +76,30 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This package provides the basic session tools, like session management
 functionality, for the GNOME Desktop.
 
+%package default-session
+License:        GPLv2+
+Summary:        Session Manager for GNOME -- Default GNOME Session
+Requires:       %{name} = %{version}
+Requires:       gnome-shell
+Requires:       gnome-settings-daemon
+Recommends:     %{name}-fallback-session
+
+%description default-session
+This package contains the definition of the default GNOME session.
+
+%package fallback-session
+License:        GPLv2+
+Summary:        Session Manager for GNOME -- Fallback GNOME Session
+Requires:       %{name} = %{version}
+Requires:       gnome-panel
+Requires:       gnome-settings-daemon
+Requires:       metacity
+Requires:       notification-daemon
+
+%description fallback-session
+This package contains the definition of the fallback GNOME session,
+which is used when the graphics are not hardware-accelerated.
+
 %package core
 License:        GPLv2+
 Summary:        Session Manager for GNOME -- Minimal Version
@@ -94,9 +111,9 @@ Requires:       hicolor-icon-theme
 %glib2_gsettings_schema_requires
 
 %description core
-This packages contain a minimal version of gnome-session, that can be used for
-specific cases. The gnome-session package is needed for a fully functional
-GNOME desktop.
+This package contains a minimal version of gnome-session, that can be
+used for specific cases. The gnome-session package is needed for a fully
+functional GNOME desktop.
 
 %lang_package
 %prep
@@ -159,25 +176,30 @@ rm -rf %{buildroot}
 %files
 %defattr (-, root, root)
 %{_bindir}/gnome
+%{_datadir}/xsessions/gnome.desktop
+# gnome-session-properties
 %{_bindir}/gnome-session-properties
-%{_datadir}/applications/*.desktop
-%{_datadir}/xsessions/*.desktop
-%{_datadir}/icons/hicolor/*/*/*.*
-%exclude %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg
+%{_datadir}/applications/session-properties.desktop
+%{_datadir}/icons/hicolor/*/apps/session-properties.*
 %{_datadir}/gnome-session/session-properties.ui
-%doc %{_mandir}/man1/gnome-session-properties.1*
-# Defined sessions (for GNOME only)
-%{_datadir}/gnome-session/sessions/gnome-fallback.session
+%doc %{_mandir}/man1/gnome-session-properties.1%{?ext_man}
+
+%files default-session
+%defattr (-, root, root)
 %{_datadir}/gnome-session/sessions/gnome.session
-# Helper for the defined sessions
-%{_libexecdir}/gnome-session-check-accelerated
-%{_libexecdir}/gnome-session-check-accelerated-helper
+
+%files fallback-session
+%defattr (-, root, root)
+%{_datadir}/gnome-session/sessions/gnome-fallback.session
 
 %files core
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/gnome-session
 %{_bindir}/gnome-session-quit
+# Helper for the session definitions, to know if hardware is accelerated
+%{_libexecdir}/gnome-session-check-accelerated
+%{_libexecdir}/gnome-session-check-accelerated-helper
 %{_datadir}/GConf/gsettings/gnome-session.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 %dir %{_datadir}/gnome-session