From b4cadf26ea247a3b2f58fd70b724d16df6cd9bc495b37f54db759d90ba8d9d31 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 7 Dec 2019 21:16:15 +0000
Subject: [PATCH] Accepting request 754133 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/754133
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=356
---
 _servicedata                           | 2 +-
 gnome-settings-daemon-3.34.1+0.obscpio | 3 ---
 gnome-settings-daemon-3.34.1+3.obscpio | 3 +++
 gnome-settings-daemon.changes          | 9 +++++++++
 gnome-settings-daemon.obsinfo          | 6 +++---
 gnome-settings-daemon.spec             | 8 ++++----
 6 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 gnome-settings-daemon-3.34.1+0.obscpio
 create mode 100644 gnome-settings-daemon-3.34.1+3.obscpio

diff --git a/_servicedata b/_servicedata
index fa9d181..1032502 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git</param>
-              <param name="changesrevision">864d28138db609469313e6f4062e938d4a477090</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">6e26304b6afb9028d733e75d120d5b9b795e61a5</param></service></servicedata>
\ No newline at end of file
diff --git a/gnome-settings-daemon-3.34.1+0.obscpio b/gnome-settings-daemon-3.34.1+0.obscpio
deleted file mode 100644
index aed1cb1..0000000
--- a/gnome-settings-daemon-3.34.1+0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6416282b068b021e6f7665c3be2fcd051f754aa83d56e74577c2a190b2bbc1e0
-size 13650445
diff --git a/gnome-settings-daemon-3.34.1+3.obscpio b/gnome-settings-daemon-3.34.1+3.obscpio
new file mode 100644
index 0000000..51b556f
--- /dev/null
+++ b/gnome-settings-daemon-3.34.1+3.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16a6b44083af79fd97144927fb8a220fc3971b1ef1bc0a4b548271ee39af3beb
+size 13650957
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 380d232..e3cc36a 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Nov 29 12:52:13 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
+
+- Update to version 3.34.1+3:
+  * media-keys: Add guard to map_keybinding()
+  * media-keys: Fix crash on key bindings migration
+  * media-keys: Use X11 display for clipboard
+- Fix build on s390x (ie without wacom support)
+
 -------------------------------------------------------------------
 Thu Nov 21 14:38:45 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/gnome-settings-daemon.obsinfo b/gnome-settings-daemon.obsinfo
index 5adfefc..05c5562 100644
--- a/gnome-settings-daemon.obsinfo
+++ b/gnome-settings-daemon.obsinfo
@@ -1,5 +1,5 @@
 name: gnome-settings-daemon
-version: 3.34.1+0
-mtime: 1570896977
-commit: 864d28138db609469313e6f4062e938d4a477090
+version: 3.34.1+3
+mtime: 1573930586
+commit: 6e26304b6afb9028d733e75d120d5b9b795e61a5
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index a6c4afb..093c952 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-settings-daemon
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
 %endif
 
 Name:           gnome-settings-daemon
-Version:        3.34.1+0
+Version:        3.34.1+3
 Release:        0
 Summary:        Settings daemon for the GNOME desktop
 License:        GPL-2.0-or-later AND LGPL-2.1-only
@@ -276,13 +276,13 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom-oled-helper
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-wacom
 %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
+%{_userunitdir}/gsd-wacom.service
+%{_userunitdir}/gsd-wacom.target
 %endif
 %{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules
 %{_userunitdir}/gnome-session-initialized.target.wants/
 %dir %{_userunitdir}/gnome-session-x11-services.target.wants/
 %{_userunitdir}/gnome-session-x11-services.target.wants/gsd-xsettings.target
-%{_userunitdir}/gsd-wacom.service
-%{_userunitdir}/gsd-wacom.target
 
 %files devel
 %doc AUTHORS ChangeLog