Merge branch f39 into epel9-next

.gitignore

@@ -59,3 +59,7 @@
 /kguiaddons-5.106.0.tar.xz
 /kguiaddons-5.107.0.tar.xz
 /kguiaddons-5.108.0.tar.xz
+/kguiaddons-5.109.0.tar.xz
+/kguiaddons-5.110.0.tar.xz
+/kguiaddons-5.111.0.tar.xz
+/kguiaddons-5.113.0.tar.xz

kf5-kguiaddons.spec

@@ -1,11 +1,13 @@
+%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
+
 %global framework kguiaddons
 
 Name:    kf5-%{framework}
-Version: 5.108.0
+Version: 5.113.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 addon with various classes on top of QtGui
 
-License: GPLv2+ and LGPLv2+
+License: BSD-2-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL
 URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %majmin_ver_kf5
@@ -24,6 +26,10 @@ BuildRequires:  qt5-qtx11extras-devel
 
 Requires:       kf5-filesystem >= %{majmin}
 
+%if %{with kf6_compat}
+Requires:       kf6-%{framework}%{?_isa}
+%endif
+
 %description
 KDBusAddons provides convenience classes on top of QtGui.
 
@@ -41,7 +47,7 @@ developing applications that use %{name}.
 
 
 %build
-%cmake_kf5
+%cmake_kf5 %{?with_kf6_compat:-DBUILD_GEO_SCHEME_HANDLER=OFF}
 
 %cmake_build
 
@@ -55,10 +61,14 @@ developing applications that use %{name}.
 %files
 %doc README.md
 %license LICENSES/*.txt
+%if %{without kf6_compat}
 %{_kf5_bindir}/kde-geo-uri-handler
+%endif
 %{_kf5_datadir}/qlogging-categories5/*categories
 %{_kf5_libdir}/libKF5GuiAddons.so.*
+%if %{without kf6_compat}
 %{_kf5_datadir}/applications/*-handler.desktop
+%endif
 
 %files devel
 %{_kf5_includedir}/KGuiAddons/
@@ -68,6 +78,30 @@ developing applications that use %{name}.
 
 
 %changelog
+* Fri Dec 08 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.113.0-1
+- 5.113.0
+
+* Mon Oct 16 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-4
+- Fix kf6-kguiaddons requires to be arch-specific
+
+* Mon Oct 16 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-3
+- Require kf6-kguiaddons if compat build
+
+* Thu Oct 12 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-2
+- Add KF6 compatibility flag
+
+* Tue Oct 10 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.111.0-1
+- 5.111.0
+
+* Tue Sep 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.110.0-1
+- 5.110.0
+
+* Sat Aug 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.109.0-1
+- 5.109.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.108.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sun Jul 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.108.0-1
 - 5.108.0
 

sources

@@ -1 +1 @@
-SHA512 (kguiaddons-5.108.0.tar.xz) = 0ed8a6233c09a89a6202ca8411ab958ce8b056141503afeadd9403cada61f652172626581d0b400e442871cc36fc0c120be63d244b8e15f5ba81d9a0f58a5ab0
+SHA512 (kguiaddons-5.113.0.tar.xz) = bc5e4d0f7524cabf60a4a7175c1a66f2ee5fbdc225e17c77c0103460a8d3ef6a50714b093c760ed0fa52b5164afd2e005c4262d5d1f2079dcdfb8c9c4363d801