From fa42a4f21b09bfabead7c554dd2d4664292ad5e7 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Jan 27 2021 00:19:16 +0000
Subject: Add spec-file for the distribution


---

diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec
index 2a16aa2..3faa344 100644
--- a/SPECS/gnome-settings-daemon.spec
+++ b/SPECS/gnome-settings-daemon.spec
@@ -6,9 +6,13 @@
 %global libgweather_version 3.9.5
 %global geoclue_version 2.3.1
 
+%if %{undefined centos}
+%bcond_without subman
+%endif
+
 Name:           gnome-settings-daemon
 Version:        3.32.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 License:        GPLv2+
@@ -21,6 +25,7 @@ BuildRequires:  gcc
 BuildRequires:  cups-devel
 BuildRequires:  gettext
 BuildRequires:  perl-interpreter
+BuildRequires:  git
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(colord) >= 1.0.2
 BuildRequires:  pkgconfig(fontconfig)
@@ -32,6 +37,9 @@ BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_sche
 BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(gweather-3.0) >= %{libgweather_version}
+%if %{with subman}
+BuildRequires:  pkgconfig(json-glib-1.0)
+%endif
 BuildRequires:  pkgconfig(lcms2) >= 2.2
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libgeoclue-2.0)
@@ -75,17 +83,37 @@ Conflicts: gnome-session < 3.27.90
 # older gdm, gnome-session and gnome-shell releases that expect the functionality
 Conflicts: gnome-shell < 3.25.4
 
+# account plugin
 Patch00001: 0001-account-first-cut-at-account-plugin.patch
 Patch00002: 0002-account-reshow-the-notification-when-screen-unlocks.patch
 Patch00003: 0003-account-display-nag-screen-periodically.patch
 Patch00004: 0004-account-don-t-poll-more-frequently-than-notification.patch
-Patch00005: 0001-smartcard-Cancel-cancellable-when-stopping.patch
-Patch00006: 0001-xsettings-Add-an-entry-for-the-overlay-scrolling-set.patch
 
-# Handle org.gnome.Shell.Screencast Stopped signal (#1705392)
-Patch00007: 0001-media-keys-Mark-screen-cast-as-stopped-if-it-was-sig.patch
+Patch10001: 0001-smartcard-Cancel-cancellable-when-stopping.patch
+
+Patch20001: 0001-xsettings-Add-an-entry-for-the-overlay-scrolling-set.patch
 
-Patch10001: 0001-housekeeping-Add-a-GPU-memory-usage-notification.patch
+# Handle org.gnome.Shell.Screencast Stopped signal (#1705392)
+Patch30001: 0001-media-keys-Mark-screen-cast-as-stopped-if-it-was-sig.patch
+
+Patch40001: 0001-housekeeping-Add-a-GPU-memory-usage-notification.patch
+
+# subscription manager integration
+Patch50001: 0001-subman-Add-a-new-plugin-to-provide-system-subscripti.patch
+Patch50002: 0002-subman-Add-InstalledProducts-dbus-property-for-g-c-c.patch
+Patch50003: 0003-subman-Increase-RHSM-dbus-call-timeouts.patch
+Patch50004: 0004-subman-Drop-userlang-field.patch
+Patch50005: 0005-subman-Use-user-locale-for-registration-subscription.patch
+Patch50006: 0006-subman-Handle-subscription-manager-giving-invalid-st.patch
+Patch50007: 0007-subman-Force-re-subscribe-if-the-admin-already-subsc.patch
+Patch50008: 0008-subman-Don-t-send-secrets-through-command-line.patch
+Patch50009: 0009-subman-Don-t-treat-failure-to-attach-as-fatal.patch
+Patch50010: 0010-subman-Add-new-no-installed-products-state.patch
+Patch50011: 0011-subman-Fix-some-build-warnings.patch
+Patch50012: 0012-subman-Add-DBus-API-to-subscribe-for-updates-on-alre.patch
+Patch50013: 0013-subman-Improve-subscription-status-handling.patch
+Patch50014: 0014-subman-Drop-LAST-from-status-enum.patch
+Patch50015: 0015-subman-Clean-up-notification-behavior.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -100,18 +128,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q
-
-%patch00001 -p 1
-%patch00002 -p 1
-%patch00003 -p 1
-%patch00004 -p 1
-%patch00005 -p 1
-%patch00006 -p 1
-%patch00007 -p 1
-
-%patch10001 -p 1
-
+%autosetup -S git
 
 %build
 %meson
@@ -208,6 +225,12 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules
 %{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
 
+%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Subscription.desktop
+%{_libexecdir}/gsd-subman
+%{_libexecdir}/gsd-subman-helper
+%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.subman.policy
+%{_datadir}/polkit-1/rules.d/org.gnome.settings-daemon.plugins.subman.rules
+
 %{_libdir}/gnome-settings-daemon-3.0/libgsd.so
 
 /usr/lib/udev/rules.d/*.rules
@@ -222,6 +245,10 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Jan 21 2021 Ray Strode <rstrode@redhat.com> - 3.32.0-13
+- Add back subscription-manager plugin
+  Related: #1870837
+
 * Tue Jan 05 2021 Jonas Ådahl <jadahl@redhat.com> - 3.32.0-12
 - Handle org.gnome.Shell.Screencast Stopped signal
   Related: #1705392