Accepting request 872077 from KDE:Frameworks5

Plasma 5.21.0 + made pulseaudio optional and pipewire-pulseaudio an alternative. KF5 is publish disabled already. (forwarded request 871992 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/872077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/discover?expand=0&rev=88

0001-Warning-for-FlatHub.patch

@@ -7,11 +7,11 @@ Subject: [PATCH] Warning for FlatHub
  .../backends/FlatpakBackend/FlatpakSourcesBackend.cpp      | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
-Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
+Index: discover-5.15.80git.20201202T042445~7a4215b7/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
 ===================================================================
---- discover-5.14.1.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
+--- discover-5.15.80git.20201202T042445~7a4215b7.orig/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2020-12-02 04:24:45.000000000 +0100
-+++ discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp
++++ discover-5.15.80git.20201202T042445~7a4215b7/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.cpp	2020-12-03 09:11:22.052037067 +0100
-@@ -26,6 +26,8 @@
+@@ -13,6 +13,8 @@
  #include <KSharedConfig>
  #include <KConfigGroup>
  #include <QDebug>
@@ -20,11 +20,10 @@ Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend
  #include <QNetworkAccessManager>
  #include <QNetworkReply>
  #include <QAction>
-@@ -55,7 +57,17 @@ FlatpakSourcesBackend::FlatpakSourcesBac
+@@ -43,8 +45,18 @@
- {
+     m_flathubAction->setObjectName(QStringLiteral("flathub"));
-     m_flathubAction->setToolTip(QStringLiteral("flathub"));
+     m_flathubAction->setToolTip(i18n("Makes it possible to easily install the applications listed in https://flathub.org"));
      connect(m_flathubAction, &QAction::triggered, this, [this](){
--        addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
 +        auto *warnBox = new QMessageBox(QMessageBox::Information, i18n("Adding a third-party source"),
 +                            i18n("FlatHub is not part of the openSUSE distribution.\n"
 +                                 "It contains packages of unknown quality which might not be tested to work correctly "
@@ -32,10 +31,11 @@ Index: discover-5.14.1/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend
 +                            QMessageBox::Ok | QMessageBox::Abort);
 +        connect(warnBox, &QMessageBox::buttonClicked, this, [this, warnBox](QAbstractButton *button) {
 +            if (warnBox->standardButton(button) == QMessageBox::Ok)
-+                addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
+         addSource(QStringLiteral("https://flathub.org/repo/flathub.flatpakrepo"));
-+        });
+     });
 +        warnBox->setAttribute(Qt::WA_DeleteOnClose);
 +        warnBox->show();
-     });
++    });
      for (auto installation : installations) {
          if (!listRepositories(installation)) {
+             qWarning() << "Failed to list repositories from installation" << installation;

discover-5.20.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5bad44f28f85782b011b775992a66b823920c44a8b898a6ff21bab53362b521
-size 10305280

discover-5.20.5.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl/0UloACgkQ7JTRj38F
-mX7vEQf8CuL1QQFWzUbWUdDr9qj4GlKxxYvWzZW/RzYk3eyalQNQht4/qlx4xOb1
-MsKrCKFjQ+tfmgr0BIUmLhe2/wQUtyZaIXQWC+hynoRESrvwuu20O3FX6eFwnORb
-0+TiQwECt7j2QfnWL9SU3lxx0xsQG08w7WJorRaZrx1vRJ4JZQPvDsORwnS2UK8Z
-dDz5eHuo+pbnbfwcaLEG+Q6FC4D4PlkSXlQWyyzdZ6yGuR8haboVONPKYyGGcOC8
-lHUFqqGJehvnuT4A8fG2e4FP/7u/vmHHsxQ06u9p76RveVxyKpUMl0CxBHGwu6IX
-lxRHCZoOsv62VT2f5+uTfiC1xB7mfw==
-=WXcF
------END PGP SIGNATURE-----

discover-5.21.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c3ea7a42892ded2e17b4dc24fde69784c7812736d46ccc79f60565553d5260c
+size 8424684

discover-5.21.0.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmAlG+4ACgkQ7JTRj38F
+mX7xGQf9Gl0QyN1NS+jU5FCg5BWTczy3vyaujEBC5kLunGW3VAYP8Z+vLkOhrrZC
+ar6rEkxDb8w3MpvAhgfQlBLv8dbI97e+VdibxTlF8hHj/4YiWr3BwjNxXRDJDmPQ
+6a5ueqZw4AEWfRuIx+vmjrV++vpUWq3qgb5sPkLwyt7fi2/a+KcYyjUYrHiPp2f2
++kquaA1qYFQu6ykI7qEijEejkSo03I+6BknhEQJJBHoeLhXlhLbm6Vyp6SFyom/T
+ZgHCyfZtMG+jHTQ+5B3OndqwLt17P13Az9oHKUCK6qht+M7mriobaiL+GzJ7xsBw
+nayByrf467pjvqCU3AB/fYFi2RP/8A==
+=alH5
+-----END PGP SIGNATURE-----

discover.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Feb 11 18:23:10 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.21.0
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/5.21.0
+- Changes since 5.20.90:
+  * Do not always bring refreshed resources in (kde#432654)
+  * Don't show the search action on desktop mode (kde#432693)
+  * pk: Don't call the size function as it triggers a details fetch
+  * pk: no need to fetch the details of the updatable packages
+  * odrs: Move JSON parsing to a separate thread
+  * pk: Small optimisation
+  * pk: Make sure that we give precedence to the first pkgid we receive
+  * pk: remove unused method
+  * pk: Make sure we execute absolute paths
+  * flatpak: Make sure we refresh the size display on the views
+  * Show a "Search" main action on mobile on the Featured page
+  * Do not show "Sorry, nothing found" on the search page before searching
+  * pk: also remove duplicates from accounnting for the offline upgrades
+  * [Updates page] Match style of Kirigami.PlaceholderMessage
+  * pk: Fix installed filtering (kde#428681)
+  * packagekit: Don't list repeated packages several times
+  * pk: sort the updated package in offline updates description
+
+-------------------------------------------------------------------
+Thu Jan 21 21:31:32 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.20.90
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/20.90/
+- Too many changes to list here
+- Refresh 0001-Warning-for-FlatHub.patch
+
 -------------------------------------------------------------------
 Tue Jan  5 14:40:01 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

discover.spec

@@ -17,19 +17,19 @@
 
 
 %bcond_without lang
-# Version in Leap 15.1 is too old
+# Version in Leap 15.2 is too old
-%global have_fwupd (!0%{?sle_version} || 0%{?sle_version} >= 150200)
+%global have_fwupd (0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300)
 
 Name:           discover
-Version:        5.20.5
+Version:        5.21.0
 Release:        0
 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
-Source:         https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz
+Source:         discover-%{version}.tar.xz
 %if %{with lang}
-Source1:        https://download.kde.org/stable/plasma/%{version}/discover-%{version}.tar.xz.sig
+Source1:        discover-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
 # PATCH-FIX-OPENSUSE
@@ -48,7 +48,9 @@ BuildRequires:  cmake(KF5Crash)
 BuildRequires:  cmake(KF5DBusAddons)
 BuildRequires:  cmake(KF5Declarative)
 BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5IdleTime)
 BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5KCMUtils)
 BuildRequires:  cmake(KF5KIO)
 BuildRequires:  cmake(KF5Kirigami2)
 BuildRequires:  cmake(KF5NewStuff)
@@ -56,7 +58,8 @@ BuildRequires:  cmake(KF5Notifications)
 BuildRequires:  cmake(KF5Plasma)
 BuildRequires:  cmake(KF5TextWidgets)
 BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(KUserFeedback)
+# Disabled until upstream complies with the KDE policies
+#BuildRequires:  cmake(KUserFeedback)
 BuildRequires:  cmake(Qca-qt5)
 BuildRequires:  cmake(Qt5Concurrent)
 BuildRequires:  cmake(Qt5DBus)
@@ -65,6 +68,7 @@ BuildRequires:  cmake(Qt5Qml)
 BuildRequires:  cmake(Qt5Quick)
 BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5X11Extras)
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  cmake(packagekitqt5) >= 1.0.1
 %if %{have_fwupd}
@@ -145,36 +149,37 @@ user to install them using Discover.
   %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
+  rm %{buildroot}%{_kf5_applicationsdir}/org.kde.discover.snap.desktop
 
 %if %{with lang}
   %find_lang libdiscover %{name}.lang
   %find_lang plasma-discover %{name}.lang
 
   %find_lang plasma-discover-notifier notifier.lang
+  %find_lang kcm_updates notifier.lang
 %else
   touch notifier.lang
 %endif
 
 %files
 %license LICENSES/*
-%{_kf5_bindir}/plasma-discover
-%{_kf5_bindir}/plasma-discover-update
-%{_kf5_libdir}/plasma-discover/
 %dir %{_kf5_plugindir}/discover/
-%{_kf5_plugindir}/discover/kns-backend.so
-%{_kf5_applicationsdir}/org.kde.discover.desktop
-%{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop
-%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
-%{_kf5_notifydir}/discoverabstractnotifier.notifyrc
-%{_kf5_kxmlguidir}/plasmadiscover/
 %dir %{_kf5_sharedir}/libdiscover/
 %dir %{_kf5_sharedir}/libdiscover/categories/
+%{_kf5_applicationsdir}/org.kde.discover.desktop
+%{_kf5_applicationsdir}/org.kde.discover.urlhandler.desktop
 %{_kf5_appstreamdir}/org.kde.discover.appdata.xml
-%{_kf5_sharedir}/discover/
+%{_kf5_bindir}/plasma-discover
-%{_libdir}/libexec/kf5/discover/
+%{_kf5_bindir}/plasma-discover-update
-%{_kf5_knsrcfilesdir}/discover_ktexteditor_codesnippets_core.knsrc
 %{_kf5_debugdir}/discover.categories
+%{_kf5_iconsdir}/hicolor/*/apps/plasmadiscover.*
+%{_kf5_knsrcfilesdir}/discover_ktexteditor_codesnippets_core.knsrc
+%{_kf5_kxmlguidir}/plasmadiscover/
+%{_kf5_libdir}/plasma-discover/
+%{_kf5_libexecdir}/discover/
+%{_kf5_notifydir}/discoverabstractnotifier.notifyrc
+%{_kf5_plugindir}/discover/kns-backend.so
+%{_kf5_sharedir}/discover/
 
 %if %{with lang}
 %files lang -f %{name}.lang
@@ -205,10 +210,16 @@ user to install them using Discover.
 %files notifier -f notifier.lang
 %license LICENSES/*
 %dir %{_kf5_plugindir}/discover-notifier
-%{_kf5_configdir}/autostart/org.kde.discover.notifier.desktop
-%{_libdir}/libexec/DiscoverNotifier
 %{_kf5_plugindir}/discover-notifier/DiscoverPackageKitNotifier.so
 %{_kf5_plugindir}/discover-notifier/FlatpakNotifier.so
+%{_kf5_configdir}/autostart/org.kde.discover.notifier.desktop
+%{_libdir}/libexec/DiscoverNotifier
 %{_kf5_applicationsdir}/org.kde.discover.notifier.desktop
+%dir %{_kf5_plugindir}/kcms/
+%{_kf5_plugindir}/kcms/kcm_updates.so
+%dir %{_kf5_sharedir}/kpackage/
+%dir %{_kf5_sharedir}/kpackage/kcms/
+%{_kf5_sharedir}/kpackage/kcms/kcm_updates/
+%{_kf5_servicesdir}/kcm_updates.desktop
 
 %changelog