diff --git a/_service b/_service
deleted file mode 100644
index ab6b66a..0000000
--- a/_service
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git
- git
- gnome-3-34
- @PARENT_TAG@+@TAG_OFFSET@
- GNOME_SETTINGS_DAEMON_(\d+)_(\d+)_(\d+)
- \1.\2.\3
- enable
-
-
-
- *.tar
- xz
-
-
-
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 0466b88..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git
- 85ca4e25051742ede54763cfd02dccd44242acf4
\ No newline at end of file
diff --git a/gnome-settings-daemon-3.34.2+0.obscpio b/gnome-settings-daemon-3.34.2+0.obscpio
deleted file mode 100644
index c7ef30c..0000000
--- a/gnome-settings-daemon-3.34.2+0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ada04703453c1eed7f157599e71269a0f702f8f82377e04c3cbd25c0ac88ae8b
-size 13652493
diff --git a/gnome-settings-daemon-3.36.0.tar.xz b/gnome-settings-daemon-3.36.0.tar.xz
new file mode 100644
index 0000000..ad8a34a
--- /dev/null
+++ b/gnome-settings-daemon-3.36.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa2ff032ec6c59e4c4ca66c61a29f4ba4b9820496625fc343bfa12291cfaad49
+size 1412700
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 5680245..346f64f 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Sat Apr 11 21:46:16 UTC 2020 - Bjørn Lie
+
+- Enable testsuite: Add python3-gobject-devel and
+ python3-python-dbusmock BuildRequires and check section, and pass
+ meson_test macro, run the testsuite during build.
+
+-------------------------------------------------------------------
+Wed Mar 11 00:20:04 UTC 2020 - mgorse@suse.com
+
+- Update to version 3.36.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar 2 13:35:36 UTC 2020 - Dominique Leuenberger
+
+- Update to version 3.35.92:
+ + CI improvements
+ + Xsettings:
+ - Load scripts from /etc/xdg/Xwayland-session.d in order to
+ lazily set up X11 sessions for wayland (e.g. Xwayland being
+ raised on demand)
+ - Delegate on gnome-shell to enable/disable animations
+ + Sharing: Drop support for vino. It is replaced by the windowing
+ agnostic gnome-remote-desktop in other places of the stack.
+ + Wacom: Fix build without wayland.
+ + Housekeeping:
+ - Use atime instead of mtime in thumbnail cleaner.
+ - Avoid crossing into different filesystems in cleanup dirs.
+ + Power: Add missing error check to realpath call.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Feb 18 16:54:23 UTC 2020 - Dominique Leuenberger
+
+- Update to version 3.35.91:
+ + Add capability to disable USB while the lockscreen is on.
+ + Power: Increase permissible runtime for some tests.
+ + Color: Look for builtin profiles in UEFI.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Feb 12 21:03:06 CET 2020 - dimstar@opensuse.org
+
+- Update to version 3.35.0:
+ + Lower systemd stop timeout.
+ + Media-keys:
+ - Add volume step configuration key.
+ - Make brightness a 0.0..1.0 float in DBus.
+ - Let the screenshot service handle saving to clipboard.
+ - Fix crash on old settings migration.
+ - Skip volume-change feedback while playing.
+ + Power:
+ - Fix rounding of brightness value.
+ - Use logind helper to change backlight brightness.
+ + Smartcard:
+ - Change manager to non-blocking.
+ - Use correct parent type for structs.
+- Switch back to regular release tarballs.
+
-------------------------------------------------------------------
Sat Jan 25 14:11:45 UTC 2020 - Dominique Leuenberger
diff --git a/gnome-settings-daemon.obsinfo b/gnome-settings-daemon.obsinfo
deleted file mode 100644
index b9f884e..0000000
--- a/gnome-settings-daemon.obsinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-name: gnome-settings-daemon
-version: 3.34.2+0
-mtime: 1576619745
-commit: 85ca4e25051742ede54763cfd02dccd44242acf4
-
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index b590b87..bb43162 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -28,13 +28,13 @@
%endif
Name: gnome-settings-daemon
-Version: 3.34.2+0
+Version: 3.36.0
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
Group: System/GUI/GNOME
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
-Source0: %{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/gnome-settings-daemon/3.36/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gnome-settings-daemon-initial-keyboard.patch bsc#979051 boo#1009515 federico@suse.com -- Deal with the default keyboard being set from xkb instead of GNOME
Patch1: gnome-settings-daemon-initial-keyboard.patch
@@ -71,7 +71,7 @@ BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.56
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.11.1
-BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0
+BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.35.91
BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.3
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gweather-3.0) >= 3.9.5
@@ -95,6 +95,10 @@ BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xkbfile)
+# Needed for tests
+BuildRequires: python3-gobject-devel
+BuildRequires: python3-python-dbusmock
+#
Requires: gsettings-desktop-schemas
# g-s-d uses the pkexec binary
Requires: polkit
@@ -175,6 +179,9 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}/%{_prefix}
+%check
+%meson_test
+
%files
%license COPYING COPYING.LIB
%doc NEWS
@@ -271,6 +278,8 @@ 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
+%dir %{_sysconfdir}/xdg/Xwayland-session.d
+%{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb
%{_userunitdir}/gsd-wacom.service
%{_userunitdir}/gsd-wacom.target
%endif
@@ -278,6 +287,10 @@ rm %{buildroot}%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.deskt
%{_userunitdir}/gnome-session-initialized.target.wants/
%dir %{_userunitdir}/gnome-session-x11-services.target.wants/
%{_userunitdir}/gnome-session-x11-services.target.wants/gsd-xsettings.target
+%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
+%{_userunitdir}/gsd-usb-protection.service
+%{_userunitdir}/gsd-usb-protection.target
+%{_libexecdir}/gnome-settings-daemon-3.0/gsd-usb-protection
%files devel
%doc AUTHORS ChangeLog