From 67e0123e8a314f6a705c5a333f4b96f78b13039b66e67365278d224ae4a98fd3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 16 Aug 2016 12:15:59 +0000 Subject: [PATCH 1/3] Accepting request 419609 from home:zhangxiaofei:branches:GNOME:Factory - Add gnome-session-check-dbus-update-activation-environment.patch (bsc#993342, bgo#768036). Check if dbus-update-activation-environment exists before calling it to silent warnings for SLE12 SP2 and LEAP 42.2. OBS-URL: https://build.opensuse.org/request/show/419609 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=244 --- ...k-dbus-update-activation-environment.patch | 24 +++++++++++++++++++ gnome-session.changes | 8 +++++++ gnome-session.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 gnome-session-check-dbus-update-activation-environment.patch diff --git a/gnome-session-check-dbus-update-activation-environment.patch b/gnome-session-check-dbus-update-activation-environment.patch new file mode 100644 index 0000000..81f4a29 --- /dev/null +++ b/gnome-session-check-dbus-update-activation-environment.patch @@ -0,0 +1,24 @@ +From 515cada5b932e52b3d20e3194fac550c32a93c42 Mon Sep 17 00:00:00 2001 +From: Felix Zhang +Date: Tue, 16 Aug 2016 17:53:03 +0800 +Subject: [PATCH] remove dbus-update-activation-environment call + +--- + gnome-session/gnome-session.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in +index 6b2ba18..975b949 100644 +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in +@@ -12,6 +12,6 @@ if [ -n "$REGION" ]; then + export LC_PAPER=$REGION + fi + +-dbus-update-activation-environment --all ||: ++which dbus-update-activation-environment > /dev/null 2>&1 && dbus-update-activation-environment --all ||: + + exec @libexecdir@/gnome-session-binary "$@" +-- +2.6.6 + diff --git a/gnome-session.changes b/gnome-session.changes index 6cb3065..5fcb702 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Aug 16 10:19:26 UTC 2016 - fezhang@suse.com + +- Add gnome-session-check-dbus-update-activation-environment.patch + (bsc#993342, bgo#768036). + Check if dbus-update-activation-environment exists before calling + it to silent warnings for SLE12 SP2 and LEAP 42.2. + ------------------------------------------------------------------- Sun Jul 17 12:04:34 UTC 2016 - fezhang@suse.com diff --git a/gnome-session.spec b/gnome-session.spec index 82e7f82..6614860 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -30,6 +30,8 @@ Source2: gnome.desktop Patch0: gnome-session-ice-auth-for-suid.patch # PATCH-FEATURE-UPSTREAM gnome-session-logging-to-systemd-journal-configurable.patch bsc#876685 bgo#768982 fezhang@suse.com -- Add a new configure switch for systemd journal support. Patch1: gnome-session-logging-to-systemd-journal-configurable.patch +# PATCH-FIX-UPSTREAM gnome-session-check-dbus-update-activation-environment.patch bsc#993342 bgo#768036 fezhang@suse.com -- Check existence of dbus-update-activation-environment before calling it to avoid warnings. +Patch2: gnome-session-check-dbus-update-activation-environment.patch BuildRequires: autoconf BuildRequires: fdupes BuildRequires: intltool @@ -107,6 +109,7 @@ translation-update-upstream %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 %build autoconf From bad0c90df01a784eaf02a623e9a92bfb03604e191a62dfb04f2d48f6fad9b86c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 16 Aug 2016 12:16:56 +0000 Subject: [PATCH 2/3] tweak_changes OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=245 --- gnome-session.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index 5fcb702..9f49816 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,10 +1,10 @@ ------------------------------------------------------------------- Tue Aug 16 10:19:26 UTC 2016 - fezhang@suse.com -- Add gnome-session-check-dbus-update-activation-environment.patch - (bsc#993342, bgo#768036). +- Add gnome-session-check-dbus-update-activation-environment.patch: Check if dbus-update-activation-environment exists before calling - it to silent warnings for SLE12 SP2 and LEAP 42.2. + it to silence warnings for SLE12 SP2 and LEAP 42.2 (bsc#993342, + bgo#768036). ------------------------------------------------------------------- Sun Jul 17 12:04:34 UTC 2016 - fezhang@suse.com From 9e44e15a30fe1c01221cdc5e07df693528b3b732a9fda90366b00d2bc45b04ed Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Aug 2016 13:08:49 +0000 Subject: [PATCH 3/3] - Update gnome-session-check-dbus-update-activation-environment.patch: use the upstream commited solution OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=246 --- ...k-dbus-update-activation-environment.patch | 27 ++++++++++--------- gnome-session.changes | 7 +++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/gnome-session-check-dbus-update-activation-environment.patch b/gnome-session-check-dbus-update-activation-environment.patch index 81f4a29..e3bf06d 100644 --- a/gnome-session-check-dbus-update-activation-environment.patch +++ b/gnome-session-check-dbus-update-activation-environment.patch @@ -1,14 +1,20 @@ -From 515cada5b932e52b3d20e3194fac550c32a93c42 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Tue, 16 Aug 2016 17:53:03 +0800 -Subject: [PATCH] remove dbus-update-activation-environment call +commit 4abdb7925c3bf91e0802e42bab6c90d9a3086b2e +Author: Dominique Leuenberger +Date: Tue Aug 16 16:15:21 2016 +0200 ---- - gnome-session/gnome-session.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Do not report errors in absence of dbus-update-activation-environment + + dbus-update-activation-environment was introduced with dbus 1.10.4 + gnome-session by itself does not depend on any specific version of + dbus at all - but on dbus-glib-1 (DBUS_GLIB_REQUIRED=0.76) + + The latest version of dbus-glib (ver 106) requires dbus-1 1.8: it is + thus a valid setup to run not have dbus-update-activation-environment + on the system. Warning the user about its absence is alerting users + for not reason. diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index 6b2ba18..975b949 100644 +index 6b2ba18..5f4b303 100644 --- a/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in @@ -12,6 +12,6 @@ if [ -n "$REGION" ]; then @@ -16,9 +22,6 @@ index 6b2ba18..975b949 100644 fi -dbus-update-activation-environment --all ||: -+which dbus-update-activation-environment > /dev/null 2>&1 && dbus-update-activation-environment --all ||: ++dbus-update-activation-environment --all >& /dev/null ||: exec @libexecdir@/gnome-session-binary "$@" --- -2.6.6 - diff --git a/gnome-session.changes b/gnome-session.changes index 9f49816..ccc3b8c 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 18 13:08:30 UTC 2016 - dimstar@opensuse.org + +- Update + gnome-session-check-dbus-update-activation-environment.patch: use + the upstream commited solution + ------------------------------------------------------------------- Tue Aug 16 10:19:26 UTC 2016 - fezhang@suse.com