Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2017-09-25 13:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-session (Old) and /work/SRC/openSUSE:Factory/.gnome-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-session" Mon Sep 25 13:56:34 2017 rev:173 rq:528349 version:3.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2017-09-21 12:30:47.661468333 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2017-09-25 13:56:38.194301693 +0200 @@ -1,0 +2,23 @@ +Fri Sep 22 11:52:18 UTC 2017 - [email protected] + +- Re-add + gnome-session-logging-to-systemd-journal-configurable.patch (not + yet upstream [bsc#979498], [bgo#768982]). + +------------------------------------------------------------------- +Fri Sep 22 08:36:31 UTC 2017 - [email protected] + +- Revert "Enable SLE-Classic for wayland": the SLE-Classic session + requires gnome-shell-extensions, which is the reason why the + X-Session is shipped as part of that package. The wayland session + should also be there. + +------------------------------------------------------------------- +Wed Sep 20 12:12:26 UTC 2017 - [email protected] + +- Register GNOME with u-a handler for default.desktop + implementation, which obsoletes the change in + /etc/sysconfig/windowmanager to pick the 'default window manager' + (boo#1039756). + +------------------------------------------------------------------- Old: ---- sle-classic.desktop New: ---- gnome-session-logging-to-systemd-journal-configurable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.GCX3rL/_old 2017-09-25 13:56:38.782218975 +0200 +++ /var/tmp/diff_new_pack.GCX3rL/_new 2017-09-25 13:56:38.786218412 +0200 @@ -26,14 +26,12 @@ Source: http://download.gnome.org/sources/gnome-session/3.26/%{name}-%{version}.tar.xz Source1: gnome Source2: gnome.desktop -Source3: sle-classic.desktop +# PATCH-FEATURE-UPSTREAM gnome-session-logging-to-systemd-journal-configurable.patch bsc#876685 bgo#768982 [email protected] -- Add a new configure switch for systemd journal support. +Patch0: gnome-session-logging-to-systemd-journal-configurable.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig BuildRequires: tcpd-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif BuildRequires: update-desktop-files BuildRequires: xsltproc BuildRequires: pkgconfig(dbus-glib-1) >= 0.76 @@ -59,6 +57,9 @@ Requires: %{name}-core = %{version} Requires: %{name}-default-session = %{version} Recommends: %{name}-lang +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif # gnome-session-wayland not recommended by default yet: causes various issues: # qemu's default video mode is 'cirrus', which stays black with GNOME Wayland # YaST cannot be started without additional tricks @@ -106,6 +107,7 @@ %prep %setup -q +%patch0 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif @@ -126,9 +128,6 @@ install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop -%if !0%{?is_opensuse} -install -m644 %{SOURCE3} %{buildroot}%{_datadir}/wayland-sessions/sle-classic.desktop -%endif %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %find_lang %{name}-3.0 %{?no_lang_C} %fdupes %{buildroot}/%{_prefix} @@ -137,11 +136,26 @@ rm -fr %{buildroot}%{_datadir}/wayland-sessions %endif +# Prepare for 'default.desktop' being update-alternative handled, boo#1039756 +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + +%post +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/gnome.desktop 25 + +%postun +[ -f %{_datadir}/xsessions/gnome.desktop ] || %{_sbindir}/update-alternatives \ + --remove default-xsession.desktop %{_datadir}/xsessions/gnome.desktop + %files %defattr (-, root, root) %{_bindir}/gnome +%{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/gnome.desktop %{_datadir}/xsessions/gnome-xorg.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files default-session %defattr (-, root, root) @@ -153,9 +167,6 @@ %defattr (-, root, root) %dir %{_datadir}/wayland-sessions %{_datadir}/wayland-sessions/gnome.desktop -%if !0%{?is_opensuse} -%{_datadir}/wayland-sessions/sle-classic.desktop -%endif # Disabled as wayland is now the default session again. #{_datadir}/wayland-sessions/gnome-wayland.desktop %endif ++++++ gnome-session-logging-to-systemd-journal-configurable.patch ++++++ >From e7675cc3c3c078aedf57e6d386f10c47eb22f0d1 Mon Sep 17 00:00:00 2001 From: Felix Zhang <[email protected]> Date: Sun, 17 Jul 2016 17:27:06 +0800 Subject: [PATCH] logging to systemd journal configurable --- configure.ac | 19 +++++++++++++++++++ gnome-session/gsm-autostart-app.c | 6 ++++-- gnome-session/gsm-manager.c | 8 ++++---- gnome-session/main.c | 4 ++-- 4 files changed, 29 insertions(+), 8 deletions(-) Index: gnome-session-3.26.0/configure.ac =================================================================== --- gnome-session-3.26.0.orig/configure.ac 2017-09-12 16:06:00.000000000 +0200 +++ gnome-session-3.26.0/configure.ac 2017-09-22 13:53:17.805764740 +0200 @@ -148,6 +148,25 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test "$enable_systemd" = "yes"], [Using systemd]) dnl ==================================================================== +dnl systemd journal support +dnl ==================================================================== +AC_ARG_ENABLE([systemd-journal], + AS_HELP_STRING([--enable-systemd-journal], [Send output to systemd journal]), + [enable_systemd_journal=$enableval], + [enable_systemd_journal=$enable_systemd]) + +AC_MSG_CHECKING([whether to send the outputs of gnome-session and its child processes to systemd journal]) + +AC_MSG_RESULT($enable_systemd_journal) + +if test x$enable_systemd_journal = xyes ; then + if test x$enable_systemd = xno ; then + AC_MSG_ERROR([Systemd not found, or it is not enabled]) + fi + AC_DEFINE(ENABLE_SYSTEMD_JOURNAL, 1, [Define if output should be send to systemd journal]) +fi + +dnl ==================================================================== dnl Check for ConsoleKit dnl ==================================================================== Index: gnome-session-3.26.0/gnome-session/gsm-autostart-app.c =================================================================== --- gnome-session-3.26.0.orig/gnome-session/gsm-autostart-app.c 2017-05-30 18:57:54.000000000 +0200 +++ gnome-session-3.26.0/gnome-session/gsm-autostart-app.c 2017-09-22 13:53:17.805764740 +0200 @@ -33,7 +33,9 @@ #endif #ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL #include <systemd/sd-journal.h> +#endif #include <systemd/sd-daemon.h> #endif @@ -1027,7 +1029,7 @@ app->priv->startup_id = sn_id; } -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL static void on_child_setup (GsmAutostartApp *app) { @@ -1098,7 +1100,7 @@ g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id); } -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL if (sd_booted () > 0) { child_setup_func = (GSpawnChildSetupFunc) on_child_setup; child_setup_data = app; Index: gnome-session-3.26.0/gnome-session/gsm-manager.c =================================================================== --- gnome-session-3.26.0.orig/gnome-session/gsm-manager.c 2017-07-19 17:07:22.000000000 +0200 +++ gnome-session-3.26.0/gnome-session/gsm-manager.c 2017-09-22 13:53:17.805764740 +0200 @@ -40,7 +40,7 @@ #include "gsm-manager.h" #include "org.gnome.SessionManager.h" -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL #include <systemd/sd-journal.h> #endif @@ -271,7 +271,7 @@ allow_logout = !_log_out_is_locked_down (manager); } -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_UNRECOVERABLE_FAILURE_MSGID, "PRIORITY=%d", 3, "MESSAGE=Unrecoverable failure in required component %s", app_id, @@ -301,7 +301,7 @@ extensions = NULL; } -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_UNRECOVERABLE_FAILURE_MSGID, "PRIORITY=%d", 3, "MESSAGE=Unrecoverable failure in required component %s", app_id, @@ -1355,7 +1355,7 @@ do_phase_startup (manager); break; case GSM_MANAGER_PHASE_RUNNING: -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_STARTUP_SUCCEEDED_MSGID, "PRIORITY=%d", 5, "MESSAGE=Entering running state", Index: gnome-session-3.26.0/gnome-session/main.c =================================================================== --- gnome-session-3.26.0.orig/gnome-session/main.c 2017-06-29 16:24:18.000000000 +0200 +++ gnome-session-3.26.0/gnome-session/main.c 2017-09-22 13:53:17.805764740 +0200 @@ -41,7 +41,7 @@ #include "gsm-system.h" #include "gsm-fail-whale.h" -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL #include <systemd/sd-journal.h> #endif @@ -329,7 +329,7 @@ * journald picks ups the nicer "gnome-session" as the program * name instead of whatever shell script GDM happened to use. */ -#ifdef HAVE_SYSTEMD +#ifdef ENABLE_SYSTEMD_JOURNAL if (!debug) { int journalfd;
