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
This commit is contained in:
Dominique Leuenberger 2016-08-16 12:15:59 +00:00 committed by Git OBS Bridge
parent 76b4114725
commit 67e0123e8a
3 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,24 @@
From 515cada5b932e52b3d20e3194fac550c32a93c42 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
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

View File

@ -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

View File

@ -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