Accepting request 158365 from GNOME:Next

Push GNOME:Next

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

gnome-session-3.6.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4
-size 729676

gnome-session-3.7.91.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdf5eadc9ab40cc8eceb329556fb9b1545baa5a6db22f47500d3339ab9fc48f8
+size 761040

gnome-session-properties-remove-help.patch

@@ -1,24 +0,0 @@
-From e9764e3db2696e282521c7f01dd460416f8e6ee0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 09 Feb 2013 18:15:57 +0000
-Subject: Hide non-working help button
-
-gnome-session-properties has a help button that points to
-no-longer-exising docs. Hide it until new docs are
-available.
-https://bugzilla.gnome.org/show_bug.cgi?id=658712
----
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 4270551..712b861 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -474,7 +474,6 @@ setup_dialog (GsmPropertiesDialog *dialog)
-         GtkTargetList     *targetlist;
- 
-         gtk_dialog_add_buttons (GTK_DIALOG (dialog),
--                                GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-                                 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-                                 NULL);
- 
---
-cgit v0.9.0.2

gnome-session-unblacklist-llvmpipe.patch

@@ -1,10 +0,0 @@
-Index: gnome-session-3.4.2.1/data/hardware-compatibility
-===================================================================
---- gnome-session-3.4.2.1.orig/data/hardware-compatibility
-+++ gnome-session-3.4.2.1/data/hardware-compatibility
-@@ -24,4 +24,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#-llvmpipe

gnome-session.changes

@@ -1,3 +1,92 @@
+-------------------------------------------------------------------
+Wed Mar  6 11:57:23 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.91:
+  + Use pkg-config to check for X libraries.
+  + Automatically fallback to software renderering if hardware
+    renderering doesn't pass the sniff test.
+  + fix positioning of fail whale dialog.
+  + Updated translations.
+- Add pkgconfig(x11) BuildRequires: new verified dependency.
+
+-------------------------------------------------------------------
+Tue Feb 19 19:53:36 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.90:
+  + Add preliminary patch toward systemd-ification.
+  + Fix XSMP clients after shutdown is canceled.
+  + Make build with newer upower.
+  + Adjust for new gnome-desktop idle api.
+  + Add session selector.
+  + Set XDG_MENU_PREFIX.
+  + Updated translations.
+- Drop gnome-session-selector.patch: fixed upstream.
+- Drop gnome-session-properties-remove-help.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Mon Feb 18 22:36:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.4:
+  + Remove the fallback session definition (bgo#687586).
+  + Remove support for RequiredProviders (bgo#691663).
+  + Show the fail whale if GNOME shell can't run (bgo#687586).
+  + Log to the systemd journal when available (bgo#691785).
+  + Make SIGUSR1 print a line in debug output (bgo#692241).
+  + Add an InhibitedActions D-Bus property (bgo#692517).
+  + Reduce default idle timeout to 2 minutes.
+  + Move automatic logout on idle functionality to
+    gnome-settings-daemon (bgo#597030).
+  + Allow empty sessions (bgo#690866).
+  + Allow named saved sessions (bgo#613270).
+  + Updated translations.
+- Drop fallback-session package: the fallback mode has been removed
+  upstream. A collection of extensions is available to reproduce
+  a GNOME 2 Look and Feel.
+- Drop pkgconfig(libnotify) BuildRequires: no longer needed.
+- Add gnome-session-selector.patch: Don't install session-selector
+  man-pages and .ui files if the session-selector is not being
+  installed.
+
+-------------------------------------------------------------------
+Mon Feb 18 21:56:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.3:
+  + Use GnomeIdleMonitor for idle detection
+  + Enable llvmpipe
+  + Fix some error spew
+  + Make --version not return a failure code
+  + Reduce depedency on GTK+
+  + Shutdown and logout fixes
+  + Add automatic logout on idle feature
+  + Docs fixes
+  + Misc fixes
+  + Updated translations.
+- Add pkgconfig(gnome-desktop-3.0), pkgconfig(gio-unix-2.0) and
+  pkgconfig(libnotify) BuildRequires: new dependencies.
+- Drop gnome-session-unblacklist-llvmpipe.patch: fixed upstream.
+
+-------------------------------------------------------------------
+Mon Feb 18 21:46:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.2:
+  + Be more careful when dropping system inhibitors.
+  + Add a commandline wrapper for inhibiting.
+  + Add a GetLocale() D-Bus method.
+  + Add a SessionIsActive D-Bus property.
+  + Modernize the code in some places.
+  + Initialize GsmSystem before acquiring a bus name.
+  + Properly initialize upower client.
+  + Reject xsmp clients sooner when ending the session.
+  + Set _GNOME_MAX_SCREEN_SIZE root window property.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Feb 18 21:37:49 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 3.7.1:
+  + Add gnome-screensaver to fallback session.
+  + Make SessionName property introspectable.
+
 -------------------------------------------------------------------
 Mon Feb 18 21:36:49 UTC 2013 - mike.catanzaro@gmail.com
 

gnome-session.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-session
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -19,23 +19,19 @@
 %define with_systemd 1
 
 Name:           gnome-session
-Version:        3.6.2
+Version:        3.7.91
 Release:        0
 Summary:        Session Tools for the GNOME Desktop
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
-Source:         http://download.gnome.org/sources/gnome-session/3.6/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-session/3.7/%{name}-%{version}.tar.xz
 Source1:        gnome
 Source2:        gnome.desktop
 # PATCH-FIX-UPSTREAM gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var.
 Patch0:         gnome-session-ice-auth-for-suid.patch
 # PATCH-FIX-UPSTREAM gnome-session-kdm-support.patch hpj@novell.com -- Adds support for KDM logout commands.
 Patch1:         gnome-session-kdm-support.patch
-# PATCH-FIX-UPSTREAM gnome-session-properties-remove-help.patch bnc#804180 bgo#658712 mike.catanzaro@gmail.com -- This module no longer has help so remove the button
-Patch2:         gnome-session-properties-remove-help.patch
-# PATCH-FEATURE-OPENSUSE gnome-session-unblacklist-llvmpipe.patch badshah400@gmail.com -- Remove llvmpipe from blacklisted drivers to enable full gnome-shell session on virtual machines.
-Patch4:         gnome-session-unblacklist-llvmpipe.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  hicolor-icon-theme
@@ -46,8 +42,10 @@ BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.76
 # Support gconf-based autostart
 BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.35.0
 BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.33.4
+BuildRequires:  pkgconfig(glib-2.0) >= 2.35.0
+BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.7.90
 BuildRequires:  pkgconfig(gtk+-3.0) >= 2.90.7
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.10
@@ -57,6 +55,7 @@ BuildRequires:  pkgconfig(libsystemd-login)
 %endif
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(upower-glib) >= 0.9.0
+BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xext)
@@ -84,28 +83,14 @@ Group:          System/GUI/GNOME
 Requires:       %{name} = %{version}
 Requires:       gnome-settings-daemon
 Requires:       gnome-shell
-Recommends:     %{name}-fallback-session
 
 %description default-session
 This package contains the definition of the default GNOME session.
 
-%package fallback-session
-Summary:        Session Manager for GNOME -- Fallback GNOME Session
-Group:          System/GUI/GNOME
-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 -n gnome2-look-and-feel
 Summary:        GNOME Desktop with the GNOME 2 Look and Feel
 Group:          System/GUI/GNOME
-Requires:       %{name}-fallback-session
+# TO BE DEFINED.. shoult require the correct classic extensions to make this up
 
 %description -n gnome2-look-and-feel
 This package contains the definition to choose in the display manager
@@ -133,8 +118,6 @@ functional GNOME desktop.
 translation-update-upstream
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch4 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh
@@ -155,9 +138,9 @@ 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 a session file for gnome 2 look-and-feel (fallback mode)
+# Install a session file for gnome 2 look-and-feel (gnome3 with classic look and feel extensions)
 install -m644 %{S:2} %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
-sed -i "s/^Exec=.*/Exec=gnome --session gnome-fallback/" %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
+# FIXME: gnome2-look-and-feel.desktop needs to be corrected to know how to statr classic mode.
 %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %suse_update_desktop_file -N "GNOME 2 Look and Feel" %{buildroot}%{_datadir}/xsessions/gnome2-look-and-feel.desktop
@@ -197,10 +180,7 @@ rm -rf %{buildroot}
 %files default-session
 %defattr (-, root, root)
 %{_datadir}/gnome-session/sessions/gnome.session
-
+%{_datadir}/gnome-session/sessions/gnome-dummy.session
-%files fallback-session
-%defattr (-, root, root)
-%{_datadir}/gnome-session/sessions/gnome-fallback.session
 
 %files -n gnome2-look-and-feel
 %defattr(-, root, root)
@@ -210,17 +190,20 @@ rm -rf %{buildroot}
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/gnome-session
+%{_bindir}/gnome-session-inhibit
 %{_bindir}/gnome-session-quit
 %{_datadir}/GConf/gsettings/gnome-session.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 %dir %{_datadir}/gnome-session
 %dir %{_datadir}/gnome-session/sessions
 %{_datadir}/gnome-session/gsm-inhibit-dialog.ui
-%doc %{_mandir}/man1/gnome-session.1*
+%doc %{_mandir}/man1/gnome-session.1%{?ext_man}
-%doc %{_mandir}/man1/gnome-session-quit.1*
+%doc %{_mandir}/man1/gnome-session-inhibit.1%{?ext_man}
+%doc %{_mandir}/man1/gnome-session-quit.1%{?ext_man}
 # Helper for the session definitions, to know if hardware is accelerated
 %{_libexecdir}/gnome-session-check-accelerated
 %{_libexecdir}/gnome-session-check-accelerated-helper
+%{_libexecdir}/gnome-session-failed
 %{_datadir}/gnome-session/hardware-compatibility
 
 %files lang -f %{name}-3.0.lang