From 90c24fe46d96732d7c07d50ca30506b519443c70 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 25 Sep 2019 17:41:15 +0200
Subject: [PATCH] Unbreak the 'classic' GNOME session

---
 ...ta-Adjust-to-g-s-d-s-plugin-removals.patch | 26 +++++++++++++++++++
 gnome-shell-extensions.spec                   |  8 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 gnome-shell-extensions-data-Adjust-to-g-s-d-s-plugin-removals.patch

diff --git a/gnome-shell-extensions-data-Adjust-to-g-s-d-s-plugin-removals.patch b/gnome-shell-extensions-data-Adjust-to-g-s-d-s-plugin-removals.patch
new file mode 100644
index 0000000..3f6c6b1
--- /dev/null
+++ b/gnome-shell-extensions-data-Adjust-to-g-s-d-s-plugin-removals.patch
@@ -0,0 +1,26 @@
+From 05bcd981cde833883bff659fb34b2dc4328bad1b Mon Sep 17 00:00:00 2001
+From: Xiaoguang Wang <xwang@suse.com>
+Date: Tue, 17 Sep 2019 09:09:22 +0800
+Subject: [PATCH] data: Adjust to g-s-d's plugin removals
+
+Remove "org.gnome.SettingsDaemon.Clipboard" and
+"org.gnome.SettingsDaemon.Mouse", now the function is moved to
+gnome-shell/mutter.
+
+https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/94
+---
+ data/gnome-classic.session.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in
+index f359a7703a9a..c29447d32243 100644
+--- a/data/gnome-classic.session.desktop.in
++++ b/data/gnome-classic.session.desktop.in
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ Name=GNOME Classic
+-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
+-- 
+2.20.1
+
diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec
index c172ee7..a195251 100644
--- a/gnome-shell-extensions.spec
+++ b/gnome-shell-extensions.spec
@@ -6,13 +6,16 @@
 
 Name:           gnome-shell-extensions
 Version:        3.34.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 License:        GPLv2+
 URL:            http://wiki.gnome.org/Projects/GnomeShell/Extensions
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1754493
+Patch0:         gnome-shell-extensions-data-Adjust-to-g-s-d-s-plugin-removals.patch
+
 # BuildRequires:  gnome-common
 BuildRequires:  meson
 BuildRequires:  sassc
@@ -272,6 +275,9 @@ workspaces.
 
 
 %changelog
+* Wed Sep 25 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.34.0-2
+- Unbreak the 'classic' GNOME session
+
 * Mon Sep 09 2019 Florian Müllner <fmuellner@redhat.com> - 3.34.0-1
 - Update to 3.34.0