[Arch-excludes] Architecture specific change in rpms/plasma-discover.git

The package rpms/plasma-discover.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/plasma-discover.git/commit/?id=9b....

Change:
+%ifarch %{qt5_qtwebengine_arches}

Thanks.


Full change:
============

commit 50fd28f99465e3f8b7b63382d1b9d3654ab7fec8
Author: Marc Deop i Argemí <marcdeop(a)fedoraproject.org&gt;
Date:   Tue Oct 18 16:20:23 2022 +0200

    5.26.1

diff --git a/.gitignore b/.gitignore
index c461964..12e045c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@
 /discover-5.25.5.tar.xz
 /discover-5.25.90.tar.xz
 /discover-5.26.0.tar.xz
+/discover-5.26.1.tar.xz
diff --git a/plasma-discover.spec b/plasma-discover.spec
index aaadaa7..e37723d 100644
--- a/plasma-discover.spec
+++ b/plasma-discover.spec
@@ -12,7 +12,7 @@
 
 Name:    plasma-discover
 Summary: KDE and Plasma resources management GUI
-Version: 5.26.0
+Version: 5.26.1
 Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
@@ -306,6 +306,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_kf5_metainfodir}/org.kde.di
 
 
 %changelog
+* Tue Oct 18 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.26.1-1
+- 5.26.1
+
 * Thu Oct 06 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.26.0-1
 - 5.26.0
 
diff --git a/sources b/sources
index 3f5b39d..9dce898 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discover-5.26.0.tar.xz) =
27bbd3f059f80365325490d702af6328149ae5f5f4e60d53708aeb2f8dea212c0b05fc5cba8ed7aa52a8ae71b6d2745f83cd153fb548ae391c3080f0117fc157
+SHA512 (discover-5.26.1.tar.xz) =
fb88c4d0632473ef248642db96e45d974f64f29f0bb06efd5c198fd4fabd3cb2feb89be984f3de8c42d0150dcb3889c2de8648b81b30d16d452fc94e3d55ddc3

commit b3eca9df6e4b0817a444ac59973a4a7206f9bd73
Author: Marc Deop i Argemí <marcdeop(a)fedoraproject.org&gt;
Date:   Thu Oct 6 16:04:05 2022 +0200

    5.26.0

diff --git a/.gitignore b/.gitignore
index b93637a..c461964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@
 /discover-5.25.4.tar.xz
 /discover-5.25.5.tar.xz
 /discover-5.25.90.tar.xz
+/discover-5.26.0.tar.xz
diff --git a/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
b/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
deleted file mode 100644
index 102e8e4..0000000
--- a/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3127d0e92c806fbbc2bc35cfd796f96b14743402..13fe64228ab35e05647ad0fe808ea3b9f20bb22f
100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,7 +22,8 @@ include(GenerateExportHeader)
- include(ECMQtDeclareLoggingCategory)
- include(KDEClangFormat)
- include(KDEGitCommitHooks)
--find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets
Test Network Xml Concurrent DBus Quick WebView)
-+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets
Test Network Xml Concurrent DBus Quick)
-+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS
WebView)
- 
- find_package(PkgConfig REQUIRED)
- 
-diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt
-index 3f56312f9dd8fcc96a5088f909b5cf1dcc702b24..c75ba1033ff1b6592540e0f207700efa5cca947a
100644
---- a/discover/CMakeLists.txt
-+++ b/discover/CMakeLists.txt
-@@ -48,10 +48,16 @@ target_link_libraries(plasma-discover PUBLIC
-                                      KF5::JobWidgets
-                                      Qt::Widgets
-                                      Qt::Quick
--                                     Qt::WebView
-                                      Discover::Common
- )
- 
-+if (TARGET Qt::WebView)
-+    target_link_libraries(plasma-discover PUBLIC Qt::WebView)
-+    target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=1)
-+else()
-+    target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=0)
-+endif()
-+
- if (TARGET KUserFeedbackCore)
-     target_link_libraries(plasma-discover PRIVATE KUserFeedbackCore)
-     target_compile_definitions(plasma-discover PRIVATE WITH_FEEDBACK=1)
-diff --git a/discover/main.cpp b/discover/main.cpp
-index 407a65fe74a98a15b8e5f0fedfd0265a34fc0156..54fa275984abf49e8ea7d82760691f713cd0b917
100644
---- a/discover/main.cpp
-+++ b/discover/main.cpp
-@@ -20,7 +20,9 @@
- #include <QStandardPaths>
- #include <QTextStream>
- #include <QWindow>
-+#if WITH_QTWEBVIEW
- #include <QtWebView>
-+#endif
- 
- #include <QProcessEnvironment>
- 
-@@ -96,7 +98,9 @@ int main(int argc, char **argv)
- {
-     // needs to be set before we create the QGuiApplication
-     QCoreApplication::setAttribute(Qt::AA_DisableSessionManager, true);
-+#if WITH_QTWEBVIEW
-     QtWebView::initialize();
-+#endif
- 
-     QApplication app(argc, argv);
-     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("plasmadiscover")));
-diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
-index fa4df2822c7e6af13348601a82e58512696032fc..72cf691e8644fe5a9d9167a10907df773efe7391
100644
---- a/discover/qml/DiscoverWindow.qml
-+++ b/discover/qml/DiscoverWindow.qml
-@@ -341,6 +341,7 @@ Kirigami.ApplicationWindow
-             function onWebflowStarted(url) {
-                 var component = Qt.createComponent("WebflowDialog.qml");
-                 if (component.status == Component.Error) {
-+                    Qt.openUrlExternally(url);
-                     console.error("Webflow Error", component.errorString())
-                 } else if (component.status == Component.Ready) {
-                     const sheet = component.createObject(window, {transaction:
transaction, url: url });
diff --git a/plasma-discover.spec b/plasma-discover.spec
index b8acd90..aaadaa7 100644
--- a/plasma-discover.spec
+++ b/plasma-discover.spec
@@ -12,8 +12,8 @@
 
 Name:    plasma-discover
 Summary: KDE and Plasma resources management GUI
-Version: 5.25.90
-Release: 2%{?dist}
+Version: 5.26.0
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -32,8 +32,6 @@ Source0:
http://download.kde.org/%{stable}/plasma/%{verdir}/%{base_name}-%{versi
 Source10: discoverrc
 
 ## upstream patches
-# git format-patch v%%{version}
-Patch0: 08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
 
 ## downstream patches
 # workaround PK metadata refresh issues (always force refresh)
@@ -308,6 +306,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_kf5_metainfodir}/org.kde.di
 
 
 %changelog
+* Thu Oct 06 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.26.0-1
+- 5.26.0
+
 * Wed Sep 21 2022 Marc Deop marcdeop(a)fedoraproject.org - 5.25.90-2
 - Add patch to support systems without a Qt WebView
 
diff --git a/sources b/sources
index c3e8286..3f5b39d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discover-5.25.90.tar.xz) =
e90d02228a0ba9a94074d7f152ed283a8333efdd9a6ae23025fa46bd4c917f1d715c3e9f1d1fb429f77ad9c216cbe49cf887c91517708a5d3db3d448d5eedfba
+SHA512 (discover-5.26.0.tar.xz) =
27bbd3f059f80365325490d702af6328149ae5f5f4e60d53708aeb2f8dea212c0b05fc5cba8ed7aa52a8ae71b6d2745f83cd153fb548ae391c3080f0117fc157

commit 9bf500b3b2bb9ee2d32a71ffd2b461192ae47cea
Author: Marc Deop i Argemí <marcdeop(a)fedoraproject.org&gt;
Date:   Wed Sep 21 14:42:28 2022 +0200

    fix: add pkgconfig(Qt5WebView) only on supported arches

diff --git a/plasma-discover.spec b/plasma-discover.spec
index 4fba332..b8acd90 100644
--- a/plasma-discover.spec
+++ b/plasma-discover.spec
@@ -101,7 +101,9 @@ BuildRequires: pkgconfig(Qt5QuickWidgets)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5Test)
 BuildRequires: pkgconfig(Qt5Widgets)
+%ifarch %{qt5_qtwebengine_arches}
 BuildRequires: pkgconfig(Qt5WebView)
+%endif
 BuildRequires: pkgconfig(Qt5Xml)
 BuildRequires: pkgconfig(Qt5X11Extras)
 

commit 9d31e2b5ffbba52fef7df5c7e42bbdb8a60c3776
Author: Marc Deop i Argemí <marcdeop(a)fedoraproject.org&gt;
Date:   Wed Sep 21 14:07:41 2022 +0200

    fix: add patch to support systems without qt webview

diff --git a/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
b/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
new file mode 100644
index 0000000..102e8e4
--- /dev/null
+++ b/08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
@@ -0,0 +1,72 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3127d0e92c806fbbc2bc35cfd796f96b14743402..13fe64228ab35e05647ad0fe808ea3b9f20bb22f
100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,8 @@ include(GenerateExportHeader)
+ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets
Test Network Xml Concurrent DBus Quick WebView)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets
Test Network Xml Concurrent DBus Quick)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS
WebView)
+ 
+ find_package(PkgConfig REQUIRED)
+ 
+diff --git a/discover/CMakeLists.txt b/discover/CMakeLists.txt
+index 3f56312f9dd8fcc96a5088f909b5cf1dcc702b24..c75ba1033ff1b6592540e0f207700efa5cca947a
100644
+--- a/discover/CMakeLists.txt
++++ b/discover/CMakeLists.txt
+@@ -48,10 +48,16 @@ target_link_libraries(plasma-discover PUBLIC
+                                      KF5::JobWidgets
+                                      Qt::Widgets
+                                      Qt::Quick
+-                                     Qt::WebView
+                                      Discover::Common
+ )
+ 
++if (TARGET Qt::WebView)
++    target_link_libraries(plasma-discover PUBLIC Qt::WebView)
++    target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=1)
++else()
++    target_compile_definitions(plasma-discover PUBLIC -DWITH_QTWEBVIEW=0)
++endif()
++
+ if (TARGET KUserFeedbackCore)
+     target_link_libraries(plasma-discover PRIVATE KUserFeedbackCore)
+     target_compile_definitions(plasma-discover PRIVATE WITH_FEEDBACK=1)
+diff --git a/discover/main.cpp b/discover/main.cpp
+index 407a65fe74a98a15b8e5f0fedfd0265a34fc0156..54fa275984abf49e8ea7d82760691f713cd0b917
100644
+--- a/discover/main.cpp
++++ b/discover/main.cpp
+@@ -20,7 +20,9 @@
+ #include <QStandardPaths>
+ #include <QTextStream>
+ #include <QWindow>
++#if WITH_QTWEBVIEW
+ #include <QtWebView>
++#endif
+ 
+ #include <QProcessEnvironment>
+ 
+@@ -96,7 +98,9 @@ int main(int argc, char **argv)
+ {
+     // needs to be set before we create the QGuiApplication
+     QCoreApplication::setAttribute(Qt::AA_DisableSessionManager, true);
++#if WITH_QTWEBVIEW
+     QtWebView::initialize();
++#endif
+ 
+     QApplication app(argc, argv);
+     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("plasmadiscover")));
+diff --git a/discover/qml/DiscoverWindow.qml b/discover/qml/DiscoverWindow.qml
+index fa4df2822c7e6af13348601a82e58512696032fc..72cf691e8644fe5a9d9167a10907df773efe7391
100644
+--- a/discover/qml/DiscoverWindow.qml
++++ b/discover/qml/DiscoverWindow.qml
+@@ -341,6 +341,7 @@ Kirigami.ApplicationWindow
+             function onWebflowStarted(url) {
+                 var component = Qt.createComponent("WebflowDialog.qml");
+                 if (component.status == Component.Error) {
++                    Qt.openUrlExternally(url);
+                     console.error("Webflow Error", component.errorString())
+                 } else if (component.status == Component.Ready) {
+                     const sheet = component.createObject(window, {transaction:
transaction, url: url });
diff --git a/plasma-discover.spec b/plasma-discover.spec
index ec25410..4fba332 100644
--- a/plasma-discover.spec
+++ b/plasma-discover.spec
@@ -13,7 +13,7 @@
 Name:    plasma-discover
 Summary: KDE and Plasma resources management GUI
 Version: 5.25.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -33,6 +33,7 @@ Source10: discoverrc
 
 ## upstream patches
 # git format-patch v%%{version}
+Patch0: 08f0ab031e74d722fd2b569f89c98f1c61a00b35.diff
 
 ## downstream patches
 # workaround PK metadata refresh issues (always force refresh)
@@ -305,6 +306,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_kf5_metainfodir}/org.kde.di
 
 
 %changelog
+* Wed Sep 21 2022 Marc Deop marcdeop(a)fedoraproject.org - 5.25.90-2
+- Add patch to support systems without a Qt WebView
+
 * Sat Sep 17 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.25.90-1
 - 5.25.90
 

commit 03ce3859ea3966d8d88cf41070ee624ab3e27173
Author: Marc Deop i Argemí <marcdeop(a)fedoraproject.org&gt;
Date:   Mon Sep 19 08:35:28 2022 +0200

    5.25.90

diff --git a/.gitignore b/.gitignore
index 0e6d290..b93637a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /discover-5.25.3.tar.xz
 /discover-5.25.4.tar.xz
 /discover-5.25.5.tar.xz
+/discover-5.25.90.tar.xz
diff --git a/discover-5.21.4-pk_refresh_force.patch
b/discover-5.21.4-pk_refresh_force.patch
index 947ed5c..26a6a32 100644
--- a/discover-5.21.4-pk_refresh_force.patch
+++ b/discover-5.21.4-pk_refresh_force.patch
@@ -1,8 +1,8 @@
 diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-index c796aa2..119651b 100644
+index 106a93322..d1bdd2422 100644
 --- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
 +++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-@@ -394,7 +394,7 @@ void PackageKitBackend::checkForUpdates()
+@@ -422,7 +422,7 @@ void PackageKitBackend::checkForUpdates()
  
      if (!m_refresher) {
          acquireFetching(true);
@@ -12,19 +12,19 @@ index c796aa2..119651b 100644
          connect(m_refresher.data(), &PackageKit::Transaction::errorCode, this,
&PackageKitBackend::transactionError);
          connect(m_refresher.data(), &PackageKit::Transaction::finished, this,
[this]() {
 diff --git a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
-index cba6b72..5bcd3b7 100644
+index 25eabb2ce..f2ddaa6cd 100644
 --- a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
 +++ b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
-@@ -51,7 +51,7 @@ PackageKitNotifier::PackageKitNotifier(QObject *parent)
+@@ -53,7 +53,7 @@ PackageKitNotifier::PackageKitNotifier(QObject *parent)
              bool ok;
              const int days = value.toInt(&ok);
              if (!ok || days == 0) {
--                regularCheck->setInterval(24 * 60 * 60 * 1000); // refresh at least
once every day
-+                regularCheck->setInterval(12 * 60 * 60 * 1000); //refresh at least
twice every day
+-                regularCheck->setInterval(24h); // refresh at least once every day
++                regularCheck->setInterval(12h); // refresh at least once every day
                  regularCheck->start();
                  if (!value.isEmpty())
                      qWarning() << "couldn't understand value for
timer:" << value;
-@@ -229,7 +229,7 @@ void
PackageKitNotifier::onDistroUpgrade(PackageKit::Transaction::DistroUpgrade
+@@ -262,7 +262,7 @@ void
PackageKitNotifier::onDistroUpgrade(PackageKit::Transaction::DistroUpgrade
  void PackageKitNotifier::refreshDatabase()
  {
      if (!m_refresher) {
diff --git a/plasma-discover.spec b/plasma-discover.spec
index 4b4da82..ec25410 100644
--- a/plasma-discover.spec
+++ b/plasma-discover.spec
@@ -12,7 +12,7 @@
 
 Name:    plasma-discover
 Summary: KDE and Plasma resources management GUI
-Version: 5.25.5
+Version: 5.25.90
 Release: 1%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
@@ -85,6 +85,7 @@ BuildRequires: kf5-ktextwidgets-devel
 BuildRequires: kf5-kwallet-devel
 BuildRequires: kf5-kwidgetsaddons-devel
 BuildRequires: kf5-plasma-devel
+BuildRequires: kf5-purpose-devel
 BuildRequires: kf5-rpm-macros
 BuildRequires: kf5-solid-devel
 
@@ -99,6 +100,7 @@ BuildRequires: pkgconfig(Qt5QuickWidgets)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5Test)
 BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5WebView)
 BuildRequires: pkgconfig(Qt5Xml)
 BuildRequires: pkgconfig(Qt5X11Extras)
 
@@ -238,7 +240,6 @@ appstream-util validate-relax --nonet
%{buildroot}%{_kf5_metainfodir}/org.kde.di
 %{_datadir}/applications/org.kde.discover.urlhandler.desktop
 %{_datadir}/icons/hicolor/*/apps/plasmadiscover.*
 %{_datadir}/icons/hicolor/*/apps/flatpak-discover.*
-%{_datadir}/discover/
 %{_datadir}/kxmlgui5/plasmadiscover/
 %{_kf5_libexecdir}/discover/
 %{_kf5_datadir}/kpackage/kcms/kcm_updates/
@@ -304,6 +305,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_kf5_metainfodir}/org.kde.di
 
 
 %changelog
+* Sat Sep 17 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.25.90-1
+- 5.25.90
+
 * Wed Sep 07 2022 Marc Deop <marcdeop(a)fedoraproject.org&gt; - 5.25.5-1
 - 5.25.5
 
diff --git a/sources b/sources
index 74a5d94..c3e8286 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discover-5.25.5.tar.xz) =
936c2ac4e4f3608882960080ea51e183115d35c3b1334c6287de9356ac714cb55ce37ff614b6ada78a0c5ebcf94fa028351c5102b274adb748fb421e8ddf58c7
+SHA512 (discover-5.25.90.tar.xz) =
e90d02228a0ba9a94074d7f152ed283a8333efdd9a6ae23025fa46bd4c917f1d715c3e9f1d1fb429f77ad9c216cbe49cf887c91517708a5d3db3d448d5eedfba