Merge branch 'c8' into a8

SPECS/gnome-settings-daemon.spec

@@ -12,7 +12,7 @@
 
 Name:           gnome-settings-daemon
 Version:        3.32.0
-Release:        16%{?dist}.1
+Release:        16%{?dist}.1.alma
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 License:        GPLv2+
@@ -136,7 +136,37 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -S git
+%setup -q
+
+%patch00001 -p 1
+%patch00002 -p 1
+%patch00003 -p 1
+%patch00004 -p 1
+%patch10001 -p 1
+%patch20001 -p 1
+%patch30001 -p 1
+%patch40001 -p 1
+%patch50017 -p 1
+%patch60001 -p 1
+
+%if %{with subman}
+%patch50001 -p 1
+%patch50002 -p 1
+%patch50003 -p 1
+%patch50004 -p 1
+%patch50005 -p 1
+%patch50006 -p 1
+%patch50007 -p 1
+%patch50008 -p 1
+%patch50009 -p 1
+%patch50010 -p 1
+%patch50011 -p 1
+%patch50012 -p 1
+%patch50013 -p 1
+%patch50014 -p 1
+%patch50015 -p 1
+%patch50016 -p 1
+%endif
 
 %build
 %meson
@@ -233,11 +263,13 @@ 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
 
+%if %{with subman}
 %{_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
+%endif
 
 %{_libdir}/gnome-settings-daemon-3.0/libgsd.so
 
@@ -253,10 +285,12 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Sep 13 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 3.32.0-16.el8_6.1.alma
+- Disable subman plugin
+
 * Wed Aug 31 2022 Tomas Popela <tpopela@redhat.com> - 3.32.0-16.el8_6.1
 - Prevent automatic logout warning in greeter sessions
 - Resolves: #2122964
-
 * Fri Sep 10 2021 Kalev Lember <klember@redhat.com> - 3.32.0-16
 - Update pt_BR translations
 - Resolves: #2003069