disable update notifier by default in favour of plasma-pk-updates; remove previous patches [release 5.16.4-3mamba;Thu Aug 15 2019]

discover-5.16.4-PackageKit-refresh-force.patch

@@ -0,0 +1,11 @@
+--- discover-5.16.4/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp.orig	2019-07-30 12:13:58.000000000 +0200
++++ discover-5.16.4/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp	2019-08-15 10:20:45.411000000 +0200
+@@ -396,7 +396,7 @@
+ 
+     if (!m_refresher) {
+         acquireFetching(true);
+-        m_refresher = PackageKit::Daemon::refreshCache(false);
++        m_refresher = PackageKit::Daemon::refreshCache(true);
+         connect(m_refresher.data(), &PackageKit::Transaction::errorCode, this, &PackageKitBackend::transactionError);
+         connect(m_refresher.data(), &PackageKit::Transaction::finished, this, [this]() {
+             m_refresher = nullptr;

discover-5.16.4-PackageKit-x86_64-multiarch.patch

@@ -0,0 +1,20 @@
+--- discover-5.16.4/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp.orig	2019-07-30 12:13:58.000000000 +0200
++++ discover-5.16.4/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp	2019-08-15 10:34:42.034000000 +0200
+@@ -251,15 +251,11 @@
+ 
+ void PackageKitBackend::resolvePackages(const QStringList &packageNames)
+ {
+-    PackageKit::Transaction * tArch = PackageKit::Daemon::resolve(packageNames, PackageKit::Transaction::FilterArch);
++    PackageKit::Transaction * tArch = PackageKit::Daemon::resolve(packageNames, PackageKit::Transaction::FilterNone);
+     connect(tArch, &PackageKit::Transaction::package, this, &PackageKitBackend::addPackageArch);
+     connect(tArch, &PackageKit::Transaction::errorCode, this, &PackageKitBackend::transactionError);
+ 
+-    PackageKit::Transaction * tNotArch = PackageKit::Daemon::resolve(packageNames, PackageKit::Transaction::FilterNotArch);
+-    connect(tNotArch, &PackageKit::Transaction::package, this, &PackageKitBackend::addPackageNotArch);
+-    connect(tNotArch, &PackageKit::Transaction::errorCode, this, &PackageKitBackend::transactionError);
+-
+-    TransactionSet* merge = new TransactionSet({tArch, tNotArch});
++    TransactionSet* merge = new TransactionSet({tArch});
+     connect(merge, &TransactionSet::allFinished, this, &PackageKitBackend::getPackagesFinished);
+ }
+ 

discover.spec

@@ -2,7 +2,7 @@
 
 Name:          discover
 Version:       5.16.4
-Release:       1mamba
+Release:       3mamba
 Summary:       KDE Frameworks 5 application installer
 Group:         Graphical Desktop/Applications/Administration
 Vendor:        openmamba
@@ -10,7 +10,8 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.kde.org
 Source:        https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz
-# Source:        http://download.kde.org/stable/frameworks/%{majver}/...-%{version}.tar.xz
+Patch0:        discover-5.16.4-PackageKit-refresh-force.patch
+Patch1:        discover-5.16.4-PackageKit-x86_64-multiarch.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -57,10 +58,27 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 KDE Frameworks 5 application installer.
 
+%package notifier
+Summary:       KDE Frameworks 5 discover notifier
+Group:         Graphical Desktop/Applications/Administration
+Requires:      %{name} == %{version}-%{release}
+
+%description notifier
+Notifier for the KDE Frameworks 5 application installer.
+
 %debug_package
 
 %prep
 %setup -q
+#%patch0 -p1
+#%ifarch x86_64
+#%patch1 -p1
+#%endif
+	
+# disable update notifier applet by default, in favour of plasma-pk-updates
+sed -i \
+  -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \
+  notifier/plasmoid/metadata.desktop
 
 %build
 %cmake_kde5 -d build
@@ -88,13 +106,10 @@ KDE Frameworks 5 application installer.
 %ifnarch arm
 %{_libdir}/qt5/plugins/discover/fwupd-backend.so
 %endif
-%dir %{_libdir}/qt5/plugins/discover-notifier
-%{_libdir}/qt5/plugins/discover-notifier/DiscoverPackageKitNotifier.so
-%{_libdir}/qt5/plugins/discover-notifier/FlatpakNotifier.so
 %{_libexecdir}/kf5/discover/runservice
-%dir %{_libdir}/qt5/qml/org/kde/discovernotifier
-%{_libdir}/qt5/qml/org/kde/discovernotifier/*
 %{_datadir}/applications/org.kde.discover*.desktop
+%{_datadir}/metainfo/org.kde.discover*.xml
+%exclude %{_datadir}/metainfo/org.kde.discovernotifier.appdata.xml
 %dir %{_datadir}/discover
 %dir %{_datadir}/discover/pkcategories
 %{_datadir}/discover/pkcategories/*.jpg
@@ -103,16 +118,30 @@ KDE Frameworks 5 application installer.
 %{_datadir}/icons/hicolor/*/apps/plasmadiscover.png
 %{_datadir}/icons/hicolor/scalable/apps/plasmadiscover.svgz
 %{_datadir}/icons/hicolor/scalable/apps/flatpak-discover.svg
-%{_datadir}/knotifications5/discoverabstractnotifier.notifyrc
 %{_datadir}/knsrcfiles/discover_ktexteditor_codesnippets_core.knsrc
-%{_datadir}/kservices5/plasma-applet-org.kde.discovernotifier.desktop
 %{_datadir}/kxmlgui5/plasmadiscover/plasmadiscoverui.rc
-%{_datadir}/metainfo/org.kde.discover*.xml
-%dir %{_datadir}/plasma/plasmoids/org.kde.discovernotifier
-%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/*
 %doc COPYING COPYING.LIB
 
+%files notifier -f %{name}5_qt.lang
+%defattr(-,root,root)
+%{_datadir}/metainfo/org.kde.discovernotifier.appdata.xml
+%dir %{_libdir}/qt5/plugins/discover-notifier
+%{_libdir}/qt5/plugins/discover-notifier/DiscoverPackageKitNotifier.so
+%{_libdir}/qt5/plugins/discover-notifier/FlatpakNotifier.so
+%dir %{_libdir}/qt5/qml/org/kde/discovernotifier
+%{_libdir}/qt5/qml/org/kde/discovernotifier/*
+%{_datadir}/knotifications5/discoverabstractnotifier.notifyrc
+%{_datadir}/kservices5/plasma-applet-org.kde.discovernotifier.desktop
+%dir %{_datadir}/plasma/plasmoids/org.kde.discovernotifier
+%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/*
+
 %changelog
+* Thu Aug 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.16.4-3mamba
+- disable update notifier by default in favour of plasma-pk-updates; remove previous patches
+
+* Thu Aug 15 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 5.16.4-2mamba
+- added patches to refresh force and support multilib on x86_64
+
 * Fri Aug 02 2019 Automatic Build System <autodist@mambasoft.it> 5.16.4-1mamba
 - automatic version update by autodist