Accepting request 360368 from GNOME:Next

Scripted push of project GNOME:Next

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

gnome-session-3.18.1.2.tar.xz

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

gnome-session-3.19.4.tar.xz

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

gnome-session-autostart-app-give-every-app-journal-id.patch

@@ -1,99 +0,0 @@
-From 5449174a1618cc7637f8c3a96c0eeae679c55248 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 5 Nov 2015 09:41:16 -0500
-Subject: autostart-app: give ever app its own journal id
-
-Right now all session output gets attributed to
-gnome-session which isn't very useful.
-
-This commit makes sure launched apps each get
-their own journal identifier.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=757571
----
- gnome-session/gsm-autostart-app.c | 44 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
-index 75008fe..08a434b 100644
---- a/gnome-session/gsm-autostart-app.c
-+++ b/gnome-session/gsm-autostart-app.c
-@@ -32,6 +32,11 @@
- #include <gconf/gconf-client.h>
- #endif
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-journal.h>
-+#include <systemd/sd-daemon.h>
-+#endif
-+
- #include "gsm-autostart-app.h"
- #include "gsm-util.h"
- 
-@@ -1014,6 +1019,34 @@ app_launched (GAppLaunchContext *ctx,
-         app->priv->startup_id = sn_id;
- }
- 
-+#ifdef HAVE_SYSTEMD
-+static void
-+on_child_setup (GsmAutostartApp *app)
-+{
-+        int standard_output, standard_error;
-+
-+        /* The FALSE means programs aren't expected to prefix each
-+         * line with <n> prefix to specify priority.
-+         */
-+        standard_output = sd_journal_stream_fd (app->priv->desktop_id,
-+                                                LOG_INFO,
-+                                                FALSE);
-+        standard_error = sd_journal_stream_fd (app->priv->desktop_id,
-+                                               LOG_WARNING,
-+                                               FALSE);
-+
-+        if (standard_output >= 0) {
-+                dup2 (standard_output, STDOUT_FILENO);
-+                close (standard_output);
-+        }
-+
-+        if (standard_error >= 0) {
-+                dup2 (standard_error, STDERR_FILENO);
-+                close (standard_error);
-+        }
-+}
-+#endif
-+
- static gboolean
- autostart_app_start_spawn (GsmAutostartApp *app,
-                            GError         **error)
-@@ -1022,6 +1055,8 @@ autostart_app_start_spawn (GsmAutostartApp *app,
-         GError          *local_error;
-         const char      *startup_id;
-         GAppLaunchContext *ctx;
-+        GSpawnChildSetupFunc child_setup_func = NULL;
-+        gpointer             child_setup_data = NULL;
-         guint handler;
- 
-         startup_id = gsm_app_peek_startup_id (GSM_APP (app));
-@@ -1041,12 +1076,19 @@ autostart_app_start_spawn (GsmAutostartApp *app,
-                 g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id);
-         }
- 
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                child_setup_func = (GSpawnChildSetupFunc) on_child_setup;
-+                child_setup_data = app;
-+        }
-+#endif
-+
-         handler = g_signal_connect (ctx, "launched", G_CALLBACK (app_launched), app);
-         success = g_desktop_app_info_launch_uris_as_manager (app->priv->app_info,
-                                                              NULL,
-                                                              ctx,
-                                                              G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
--                                                             NULL, NULL,
-+                                                             child_setup_func, child_setup_data,
-                                                              NULL, NULL,
-                                                              &local_error);
-         g_signal_handler_disconnect (ctx, handler);
--- 
-cgit v0.11.2

gnome-session.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Jan 21 15:38:31 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.19.4:
+  + Give every app its own journal id.
+  + Rework startup files as part of the wayland effort.
+  + Fix command line help output.
+- Drop gnome-session-gnome-shell-renamed.patch: fixed upstream.
+- Drop gnome-session-autostart-app-give-every-app-journal-id.patch:
+  fixed upstream.
+
+-------------------------------------------------------------------
+Mon Jan  4 16:16:53 UTC 2016 - dimstar@opensuse.org
+
+- Add gnome-session-gnome-shell-renamed.patch: gnome-shell.desktop
+  has been renamed to org.gnome.Shell.desktop.
+
+-------------------------------------------------------------------
+Wed Dec 23 15:41:08 UTC 2015 - dimstar@opensuse.org
+
+- No longer require gnome-shell-wayland: the package no longer
+  exists as the wayland session is being promoted to be default.
+
 -------------------------------------------------------------------
 Thu Nov 26 03:09:47 UTC 2015 - zaitor@opensuse.org
 

gnome-session.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-session
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,18 @@
 
 
 %define with_systemd 1
-
 Name:           gnome-session
-Version:        3.18.1.2
+Version:        3.19.4
 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.18/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gnome-session/3.19/%{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-autostart-app-give-every-app-journal-id.patch zaitor@opensuse.org -- Patch from upstream git.
-Patch1:         gnome-session-autostart-app-give-every-app-journal-id.patch
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  hicolor-icon-theme
@@ -47,10 +44,6 @@ BuildRequires:  pkgconfig(gnome-desktop-3.0) >= 3.9.91
 BuildRequires:  pkgconfig(gtk+-3.0) >= 2.90.7
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.10
-%if 0%{?suse_version} >= 1220
-BuildRequires:  pkgconfig(libsystemd-daemon)
-BuildRequires:  pkgconfig(libsystemd-login)
-%endif
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
@@ -74,6 +67,10 @@ Obsoletes:      gnome-session-fallback-session < 3.8
 # Since GNOME 3.8.0, the 'classic' mode is provided by gnome-shell-extensions.
 Obsoletes:      gnome2-look-and-feel <= 3.8.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1220
+BuildRequires:  pkgconfig(libsystemd-daemon)
+BuildRequires:  pkgconfig(libsystemd-login)
+%endif
 
 %description
 This package provides the basic session tools, like session management
@@ -94,7 +91,6 @@ Summary:        Session Manager for GNOME -- Wayland session
 Group:          System/GUI/GNOME
 Requires:       %{name} = %{version}
 Requires:       gnome-settings-daemon
-Requires:       gnome-shell-wayland
 
 %description wayland
 This package contains the definition of the default GNOME session on Wayland.
@@ -102,13 +98,13 @@ This package contains the definition of the default GNOME session on Wayland.
 %package core
 Summary:        Session Manager for GNOME -- Minimal Version
 Group:          System/GUI/GNOME
-%if ! %{with_systemd}
-Requires:       ConsoleKit
-%endif
 Requires:       dbus-1-x11
 Requires:       gsettings-desktop-schemas >= 0.1.7
 Requires:       hicolor-icon-theme
 %glib2_gsettings_schema_requires
+%if ! %{with_systemd}
+Requires:       ConsoleKit
+%endif
 
 %description core
 This package contains a minimal version of gnome-session, that can be
@@ -116,34 +112,31 @@ used for specific cases. The gnome-session package is needed for a fully
 functional GNOME desktop.
 
 %lang_package
+
 %prep
 %setup -q
 # Disabled, as it fails
 #translation-update-upstream
 %patch0 -p1
-%patch1 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh
 %configure \
         --enable-systemd \
         --disable-gconf
-%__make %{?jobs:-j%jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 # install startup script and xsession file
 install -d -m755 %{buildroot}%{_bindir}
-install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
+install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
 install -d -m755 %{buildroot}%{_datadir}/xsessions
-install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop
+install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
 %find_lang %{name}-3.0 %{?no_lang_C}
 %fdupes %{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
 %post
 %desktop_database_post
 %icon_theme_cache_post
@@ -164,6 +157,7 @@ rm -rf %{buildroot}
 %defattr (-, root, root)
 %{_bindir}/gnome
 %{_datadir}/xsessions/gnome.desktop
+%{_datadir}/xsessions/gnome-xorg.desktop
 %{_datadir}/icons/hicolor/*/apps/session-properties*
 %{_datadir}/gnome-session/session-properties.ui
 
@@ -174,9 +168,8 @@ rm -rf %{buildroot}
 
 %files wayland
 %defattr (-, root, root)
-%{_datadir}/gnome-session/sessions/gnome-wayland.session
 %dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/gnome-wayland.desktop
+%{_datadir}/wayland-sessions/gnome.desktop
 
 %files core
 %defattr (-, root, root)
@@ -188,9 +181,9 @@ rm -rf %{buildroot}
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 %dir %{_datadir}/gnome-session
 %dir %{_datadir}/gnome-session/sessions
-%doc %{_mandir}/man1/gnome-session.1%{?ext_man}
+%{_mandir}/man1/gnome-session.1%{?ext_man}
-%doc %{_mandir}/man1/gnome-session-inhibit.1%{?ext_man}
+%{_mandir}/man1/gnome-session-inhibit.1%{?ext_man}
-%doc %{_mandir}/man1/gnome-session-quit.1%{?ext_man}
+%{_mandir}/man1/gnome-session-quit.1%{?ext_man}
 %{_libexecdir}/gnome-session-binary
 # Helper for the session definitions, to know if hardware is accelerated
 %{_libexecdir}/gnome-session-check-accelerated
@@ -199,5 +192,6 @@ rm -rf %{buildroot}
 %{_datadir}/gnome-session/hardware-compatibility
 
 %files lang -f %{name}-3.0.lang
+%defattr(-,root,root)
 
 %changelog