From a66710759253fa963cdb43b0c139c237339829930b6f0801df77ce1018d30a7e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 9 Oct 2018 06:18:19 +0000 Subject: [PATCH 1/3] - Split available backends into subpackages OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=148 --- discover.changes | 5 ++++ discover.spec | 66 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/discover.changes b/discover.changes index 712c056..ee43d89 100644 --- a/discover.changes +++ b/discover.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 9 06:13:19 UTC 2018 - fabian@ritter-vogt.de + +- Split available backends into subpackages + ------------------------------------------------------------------- Fri Oct 5 10:01:08 UTC 2018 - fabian@ritter-vogt.de diff --git a/discover.spec b/discover.spec index d8aa1b7..db180bc 100644 --- a/discover.spec +++ b/discover.spec @@ -85,10 +85,39 @@ Requires: appstream-provider Requires: libzypp-plugin-appdata %endif Recommends: %{name}-lang +Recommends: %{name}-backend-packagekit +Recommends: %{name}-backend-flatpak +Recommends: %{name}-backend-fwupd %description Disover is the KDE software installer, implemented as an app store like application. +%package backend-packagekit +Summary: PackageKit Backend for Discover +Group: System/GUI/KDE +Requires: %{name} = %{version} + +%description backend-packagekit +A plugin for Discover to support management of system packages and repositories +using PackageKit. + +%package backend-flatpak +Summary: Flatpak Backend for Discover +Group: System/GUI/KDE +Requires: %{name} = %{version} + +%description backend-flatpak +A plugin for Discover to support installation and management of Flatpak +applications and repositories. + +%package backend-fwupd +Summary: fwupd Backend for Discover +Group: System/GUI/KDE +Requires: %{name} = %{version} + +%description backend-fwupd +A plugin for Discover to support updates of system firmware using fwupd. + %package plasmoid Summary: Update notification plasmoid for KDE Software Manager Group: System/GUI/KDE @@ -96,7 +125,8 @@ Conflicts: plasma5-pk-updates Requires: %{name} = %{version} %description plasmoid -This is the systray plasmoid to notify the user that updates are available +This is a plasmoid to notify the user that updates are available and allows the +user to install them using Discover. %lang_package @@ -122,6 +152,9 @@ This is the systray plasmoid to notify the user that updates are available %kf5_makeinstall -C build %suse_update_desktop_file -r org.kde.discover Qt KDE System PackageManager + # Even without the snap backend, this is installed... + rm %{buildroot}%{_kf5_applicationsdir}/org.kde.discover.snap.urlhandler.desktop + %if %{with lang} %find_lang libdiscover %{name}.lang %find_lang plasma-discover-notifier %{name}.lang @@ -136,17 +169,17 @@ This is the systray plasmoid to notify the user that updates are available %license COPYING* %{_kf5_bindir}/plasma-discover %{_kf5_libdir}/plasma-discover/ -%{_kf5_plugindir}/discover/ +%dir %{_kf5_plugindir}/discover/ +%{_kf5_plugindir}/discover/kns-backend.so %{_kf5_qmldir}/ %{_kf5_applicationsdir}/org.kde.discover.desktop -%{_kf5_applicationsdir}/org.kde.discover-flatpak.desktop %{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop -%{_kf5_applicationsdir}/org.kde.discover.snap.urlhandler.desktop %{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.* %{_kf5_notifydir}/discoverabstractnotifier.notifyrc %{_kf5_kxmlguidir}/plasmadiscover/ -%{_kf5_sharedir}/libdiscover/ -%{_kf5_appstreamdir}/ +%dir %{_kf5_sharedir}/libdiscover/ +%dir %{_kf5_sharedir}/libdiscover/categories/ +%{_kf5_appstreamdir}/org.kde.discover.appdata.xml %{_kf5_sharedir}/discover/ %{_libdir}/libexec/kf5/discover/ %config %{_kf5_configdir}/discover_ktexteditor_codesnippets_core.knsrc @@ -154,7 +187,25 @@ This is the systray plasmoid to notify the user that updates are available %if %{with lang} %files lang -f %{name}.lang -%defattr(-,root,root) +%endif + +%files backend-packagekit +%license COPYING* +%{_kf5_plugindir}/discover/packagekit-backend.so +%{_kf5_sharedir}/libdiscover/categories/packagekit-backend-categories.xml +%{_kf5_appstreamdir}/org.kde.discover.packagekit.appdata.xml + +%files backend-flatpak +%license COPYING* +%{_kf5_plugindir}/discover/flatpak-backend.so +%{_kf5_sharedir}/libdiscover/categories/flatpak-backend-categories.xml +%{_kf5_appstreamdir}/org.kde.discover.flatpak.appdata.xml +%{_kf5_applicationsdir}/org.kde.discover-flatpak.desktop + +%if 0%{?suse_version} >= 1500 +%files backend-fwupd +%license COPYING* +%{_kf5_plugindir}/discover/fwupd-backend.so %endif %files plasmoid -f plasma.lang @@ -164,5 +215,6 @@ This is the systray plasmoid to notify the user that updates are available %{_kf5_sharedir}/plasma/plasmoids/org.kde.discovernotifier/ %{_kf5_servicesdir}/plasma-applet-org.kde.discovernotifier.desktop %{_kf5_plugindir}/discover-notifier/ +%{_kf5_appstreamdir}/org.kde.discovernotifier.appdata.xml %changelog From facdb3c41a31a9415457ddf8d33a9dd5625aa15c0ee7824fcefc29447a20a5db Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 9 Oct 2018 07:51:31 +0000 Subject: [PATCH 2/3] Move requires OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=149 --- discover.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/discover.spec b/discover.spec index db180bc..c2501a4 100644 --- a/discover.spec +++ b/discover.spec @@ -74,16 +74,8 @@ BuildRequires: cmake(Qt5Xml) %if 0%{?suse_version} >= 1500 BuildRequires: pkgconfig(fwupd) >= 1.0.6 %endif -Requires: AppStream -Requires: PackageKit -Requires: flatpak Requires: kirigami2 Requires: libqt5-qtquickcontrols2 -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 -Requires: appstream-provider -%else -Requires: libzypp-plugin-appdata -%endif Recommends: %{name}-lang Recommends: %{name}-backend-packagekit Recommends: %{name}-backend-flatpak @@ -96,6 +88,15 @@ Disover is the KDE software installer, implemented as an app store like applicat Summary: PackageKit Backend for Discover Group: System/GUI/KDE Requires: %{name} = %{version} +# Technically libdiscover and not the backend implements AppStream support, but +# it's useless without system package management +Requires: AppStream +Requires: PackageKit +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 +Requires: appstream-provider +%else +Requires: libzypp-plugin-appdata +%endif %description backend-packagekit A plugin for Discover to support management of system packages and repositories @@ -105,6 +106,7 @@ using PackageKit. Summary: Flatpak Backend for Discover Group: System/GUI/KDE Requires: %{name} = %{version} +Requires: flatpak %description backend-flatpak A plugin for Discover to support installation and management of Flatpak From f9548a6acb84ad5b4005363c164c99296403af5a1efb457ac46ba6a460275bf8 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 9 Oct 2018 08:44:14 +0000 Subject: [PATCH 3/3] - Improve description by using the one from Debian and rewording it slightly. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=150 --- discover.changes | 2 ++ discover.spec | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/discover.changes b/discover.changes index ee43d89..85a6d8e 100644 --- a/discover.changes +++ b/discover.changes @@ -2,6 +2,8 @@ Tue Oct 9 06:13:19 UTC 2018 - fabian@ritter-vogt.de - Split available backends into subpackages +- Improve description by using the one from Debian and rewording it + slightly. ------------------------------------------------------------------- Fri Oct 5 10:01:08 UTC 2018 - fabian@ritter-vogt.de diff --git a/discover.spec b/discover.spec index c2501a4..2178536 100644 --- a/discover.spec +++ b/discover.spec @@ -20,7 +20,7 @@ Name: discover Version: 5.14.0 Release: 0 -Summary: KDE Software Installer +Summary: Software store for the KDE Plasma desktop License: GPL-2.0-only AND GPL-3.0-only AND GPL-3.0-or-later Group: System/GUI/KDE Url: https://quickgit.kde.org/?p=discover.git @@ -82,7 +82,9 @@ Recommends: %{name}-backend-flatpak Recommends: %{name}-backend-fwupd %description -Disover is the KDE software installer, implemented as an app store like application. +Discover is a graphical software manager for the KDE Plasma desktop. It helps users to find software they might want easily and quickly. + +By allowing to navigate a software library by search, categories, top lists along with detailed application information including screenshots and reviews, users can more quickly find applications that suit their needs. %package backend-packagekit Summary: PackageKit Backend for Discover