Accepting request 1167174 from KDE:Frameworks

KDE Frameworks 6.1.0 (forwarded request 1166463 from krop) OBS-URL: https://build.opensuse.org/request/show/1167174 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-kconfig?expand=0&rev=3
2024-04-15 18:11:48 +00:00 · 2024-04-15 18:11:48 +00:00 · b01437f284
commit b01437f284
parent b9d5f9da72 e3aff60137
7 changed files with 36 additions and 57 deletions
--- a/0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
+++ b/0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
@ -1,33 +0,0 @@
-From e948c74332e5385383e8f831de8cfc29d1b2a50e Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 16 Mar 2024 23:36:01 +0100
-Subject: [PATCH] kconf_update: Also run .upd files if times match but done is
- empty
-
-Workaround that kconf_update5 adds entries for .upd files it doesn't run.
-
-BUG: 483795
---
- src/kconf_update/kconf_update.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp
-index 0d1cd251..348e1c9a 100644
--- a/src/kconf_update/kconf_update.cpp
-+++ b/src/kconf_update/kconf_update.cpp
-@@ -151,9 +151,11 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly)
-             KConfigGroup cg(m_config, fileName);
-             const qint64 ctime = cg.readEntry("ctime", 0);
-             const qint64 mtime = cg.readEntry("mtime", 0);
-+            const QString done = cg.readEntry("done", QString());
-             if (!dirtyOnly //
-                 || (ctime != 0 && ctime != info.birthTime().toSecsSinceEpoch()) //
-                || mtime != info.lastModified().toSecsSinceEpoch()) {
-+                || mtime != info.lastModified().toSecsSinceEpoch() //
-+                || (mtime != 0 && done.isEmpty())) {
-                 result.append(file);
-             }
-         }
-- 
-2.43.0
-
--- a/kconfig-6.0.0.tar.xz
+++ b/kconfig-6.0.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f7c1e6b048df4ab3d67fbef01a5ad1dd0289c9b158644668fba0225c050c050
-size 293060
--- a/kconfig-6.0.0.tar.xz.sig
+++ b/kconfig-6.0.0.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXV3VEACgkQ11dEg7tX
-sY0IGw//RSvCtR0Si51KN1Hwywz3sDi2rGR6//Cz6g0+7ZHeyIRB66A4EvNXQz2k
-JqFdYox+gcMKTjXtK6c6C5iZkUNjkD0MysYJj4kfdstsCdxFWlcy+I9YF0mqbp55
-EayGUlyZc9Dr3H2c2zbHuRb+mg+PSS5dpikBbgIEsPmgbYCMuyD8Y5Wr+RHFFXwR
-w2HXGMGYL21D+eLQmZDxPgzAvyWNT11jzpPPc9nqrZ/ucfQsDL877y7QDHFzuy+p
-IZV6lSdX0xbhqFtPB0uHSKeEN1vvGu4xyezeAi0wUKqWfapAtoRhg838VCTpY3G8
-ovldM8NoBM2aUQ9at451OP+F3Rj+o7g7/0eFr9EHheyUcTXmGuXbWPevkhSl+vwH
-4q+7FbhKclDoaNeVAkEZ2sd4Ss/q70fKUrVA1qE7OwGoInIIT8CzgyEG7Do4xrSz
-HNQtXxpAycEg4nYgYi/ds7uUC8F0lPMbj0dqwGkr21Jgr9iVWo/fiwSTDKE0UNJf
-EHSaWmXd7cAMBF0bVHdXZMAHN/Ke7QtLzWpI7j9dPXQOm4J/x3QfeDH6ju/J4AMI
-SU9zlZamY8WBT1wHfLVbarJ2NGhKCchf/k2lGmc/dlt6JXVqz0sNTLZ0quYJJz6h
-mafPN08kGrTHsO6K9aRMqyUShKF1eUHeVF6bRwvw/IcoNtmjpTY=
-=6FPu
-----END PGP SIGNATURE-----
--- a/kconfig-6.1.0.tar.xz
+++ b/kconfig-6.1.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fda5f25beac5260a70f3f629144b5c229bf352cae208893ed44a9732c6dcaf7
+size 293324
--- a/kconfig-6.1.0.tar.xz.sig
+++ b/kconfig-6.1.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmYP2JsACgkQ11dEg7tX
+sY2Jog/9HzORCx+GETP3dp/cyZuC9xdgMIGtfcj54lDXu8ZosThYf0ydpiSMVSma
+wx3+aa19dtV3ru1pivx29cKnu4aot1kqUNO1DZtgaUmTKVFLR2ipTkQvuMVT5mxG
+3FHCy4iygVMUJ+uhh2E+EpIfSGDkSUJjYlEGOqy4l9iDVe7PYuZ3mANuMPlI+frQ
+d65iBo1ZdpZ3myYVDaW4S609ZULcYA/ZfdN0sIGYIUO+ZgglfNPzp/Vap/f+xYKN
+WSw9Oj6+0rrTToAC99WUu7sxbsBjFLCax/O8Oqgy2JAUYZolBANTitptsP6FvH3o
+LsY7EluOxXiK0W6ZPIgabMnHUVelsql/Fvn/0EoWD0jePeUg7VqB/A9FwuPrxl7x
+j0f3nCjcytuxj2cIq7ow4rrmPgsvrCibauYsZqirytKIsdn1GnGvmsKeB8QpZWA
+RVcJLaYepDo3ZRZWZjzz3+BH2uMYF5dJsSibJRdv5QwBAEVuZmD7/QoEMUQNYETa
+EtW34nJZbCpeaOVCyaDuFAs3p2gZKHZ2PkLDZQ3ELVT+YhdaBuyGgUZuNLycF5Xq
+OMHwalt8XhGTqoUAUYhuNlhlJ5nxwFsXFyeKzJqDS5BuEieMSHrcJN6P87QdSYt3
+/xUjp5h/0uSeyvqeSxMBv7yNgdZ8ndiXSa4EPPqD5lbnc8pag/A=
+=nLsl
+-----END PGP SIGNATURE-----
--- a/kf6-kconfig.changes
+++ b/kf6-kconfig.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Apr  5 12:52:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.1.0
+  * New feature release
+- Changes since 6.0.0:
+  * update version for new release
+  * Don't search for QtDBus on Windows/macOS/Android
+  * Register KConfigPropertyMap to QML
+  * kconf_update: Also run .upd files if times match but done is empty (kde#483795)
+  * Add unittest that URL[$e] works, for bug 482889
+- Drop patch, merged upstream:
+  * 0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
+
 -------------------------------------------------------------------
 Sat Mar 16 22:38:58 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

--- a/kf6-kconfig.spec
+++ b/kf6-kconfig.spec
@ -19,16 +19,16 @@
 %define qt6_version 6.6.0

 %define rname kconfig
-# Full KF6 version (e.g. 6.0.0)
+# Full KF6 version (e.g. 6.1.0)
 %{!?_kf6_version: %global _kf6_version %{version}}
 # Last major and minor KF6 version (e.g. 6.0)
 %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')}
 %bcond_without released
 Name:           kf6-kconfig
-Version:        6.0.0
+Version:        6.1.0
 Release:        0
 Summary:        Advanced configuration system
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 URL:            https://www.kde.org
 Source:         %{rname}-%{version}.tar.xz
 %if %{with released}
@ -36,8 +36,6 @@ Source1:        %{rname}-%{version}.tar.xz.sig
 Source2:        frameworks.keyring
 %endif
 Source99:       kf6-kconfig-rpmlintrc
-# https://invent.kde.org/frameworks/kconfig/-/merge_requests/283
-Patch1:         0001-kconf_update-Also-run-.upd-files-if-times-match-but-.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  kf6-extra-cmake-modules >= %{_kf6_bugfix_version}