From 1d1443df7b09e3fedc4d6a859ea934fde733273c348923e8a9b9b039789bc1a5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 26 Oct 2022 10:18:31 +0000
Subject: [PATCH] Accepting request 1031279 from GNOME:Next

To Factory for MicroOS Desktop

OBS-URL: https://build.opensuse.org/request/show/1031279
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=232
---
 gnome-software.changes | 10 ++++++++++
 gnome-software.spec    | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/gnome-software.changes b/gnome-software.changes
index 24d66a0..deab5bc 100644
--- a/gnome-software.changes
+++ b/gnome-software.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Oct 21 16:11:16 UTC 2022 - Richard Brown <rbrown@suse.com>
+
+- Split out packagekit (and related appstream) plugins into a
+  plugin-packagekit package. Recommend it by default,
+  and shift the hard requirement for PackageKit (and appstream if zypp)
+  to the new subpackage
+- This will allow flatpak-only use of gnome-software, as needed by
+  the MicroOS Desktop
+
 -------------------------------------------------------------------
 Fri Oct 21 14:27:36 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-software.spec b/gnome-software.spec
index b556853..4219633 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -60,10 +60,9 @@ BuildRequires:  pkgconfig(sysprof-4)
 BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  pkgconfig(xmlb) >= 0.1.7
 # boo#1090042
-Requires:       PackageKit
 Requires:       fwupd
 Requires:       iso-codes
-Requires:       (libzypp-plugin-appdata if PackageKit-backend-zypp)
+Recommends:     %{name}-plugin-packagekit
 Recommends:     flatpak
 # bsc#1178768
 %if 0%{?sle_version}
@@ -82,6 +81,17 @@ Requires:       %{name} = %{version}
 This subpackage contains the header files for developing
 GNOME software store plugins.
 
+%package plugin-packagekit
+Summary:        GNOME Software Store - PackageKit plugin
+Group:          System/GUI/GNOME
+Requires:       %{name} = %{version}
+Requires:       PackageKit
+Requires:       (libzypp-plugin-appdata if PackageKit-backend-zypp)
+
+%description plugin-packagekit
+This subpackage provides the packagekit plugin used by
+the GNOME software store.
+
 %lang_package
 
 %prep
@@ -137,7 +147,23 @@ FOE
 %{_distconfdir}/xdg/autostart/org.gnome.Software.desktop
 
 %dir %{_libdir}/gnome-software/plugins-%{gs_plugin_api}/
-%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/*.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_dpkg.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_dummy.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_epiphany.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_fedora-langpacks.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_fedora-pkgdb-collections.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_flatpak.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_fwupd.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_generic-updates.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_hardcoded-blocklist.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_icons.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_malcontent.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_modalias.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_os-release.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_provenance-license.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_provenance.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_repos.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_rewrite-resource.so
 %{_libdir}/gnome-software/libgnomesoftware.so.%{gs_plugin_api}
 %dir %{_datadir}/swcatalog/
 %dir %{_datadir}/swcatalog/xml/
@@ -155,6 +181,10 @@ FOE
 %{_libdir}/pkgconfig/gnome-software.pc
 %{_libdir}/gnome-software/libgnomesoftware.so
 
+%files plugin-packagekit
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_packagekit.so
+%{_libdir}/gnome-software/plugins-%{gs_plugin_api}/libgs_plugin_appstream.so
+
 %files lang -f %{name}.lang
 
 %changelog