Merge branch epel8-next into epel8

.gitignore

@@ -44,23 +44,6 @@
 /kguiaddons-5.90.0.tar.xz
 /kguiaddons-5.91.0.tar.xz
 /kguiaddons-5.92.0.tar.xz
-./kguiaddons-5.93.tar.xz
+/kguiaddons-5.93.0.tar.xz
 /kguiaddons-5.94.0.tar.xz
 /kguiaddons-5.96.0.tar.xz
-/kguiaddons-5.97.0.tar.xz
-/kguiaddons-5.98.0.tar.xz
-/kguiaddons-5.99.0.tar.xz
-/kguiaddons-5.100.0.tar.xz
-/kguiaddons-5.101.0.tar.xz
-/kguiaddons-5.102.0.tar.xz
-/kguiaddons-5.103.0.tar.xz
-/kguiaddons-5.104.0.tar.xz
-/kguiaddons-5.105.0.tar.xz
-/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
-/kguiaddons-5.115.0.tar.xz

kf5-kguiaddons.spec

@@ -1,17 +1,20 @@
-%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
-
 %global framework kguiaddons
 
 Name:    kf5-%{framework}
-Version: 5.115.0
+Version: 5.96.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 addon with various classes on top of QtGui
 
-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 (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
+License: GPLv2+ and LGPLv2+
 URL:     https://invent.kde.org/frameworks/%{framework}
 
-%global majmin %majmin_ver_kf5
+%global majmin %(echo %{version} | cut -d. -f1-2)
-%global stable %stable_kf5
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
+%endif
 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 BuildRequires:  extra-cmake-modules >= %{majmin}
@@ -26,10 +29,6 @@ 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.
 
@@ -47,7 +46,7 @@ developing applications that use %{name}.
 
 
 %build
-%cmake_kf5 %{?with_kf6_compat:-DBUILD_GEO_SCHEME_HANDLER=OFF}
+%cmake_kf5
 
 %cmake_build
 
@@ -61,14 +60,10 @@ 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/
@@ -78,85 +73,6 @@ developing applications that use %{name}.
 
 
 %changelog
-* Sat Feb 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.115.0-1
-- 5.115.0
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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
-
-* Sat Jun 03 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.107.0-1
-- 5.107.0
-
-* Mon May 15 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.106.0-1
-- 5.106.0
-
-* Sun Apr 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.105.0-1
-- 5.105.0
-
-* Sat Mar 04 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.104.0-1
-- 5.104.0
-
-* Sun Feb 05 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.103.0-1
-- 5.103.0
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.102.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jan 14 2023 Marc Deop <marcdeop@fedoraproject.org> - 5.102.0-1
-- 5.102.0
-
-* Mon Dec 12 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.101.0-1
-- 5.101.0
-- use new macros to simplify code
-
-* Sun Nov 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.100.0-1
-- 5.100.0
-
-* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.99.0-1
-- 5.99.0
-
-* Thu Sep 15 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.98.0-1
-- 5.98.0
-
-* Sat Aug 13 2022 Justin Zobel <justin@1707.io> - 5.97.0-1
-- Update to 5.97.0
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.96.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jul 14 2022 Jan Grulich <jgrulich@redhat.com> - 5.96.0-2
-- Rebuild (qt5)
-
 * Sun Jul 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.96.0-1
 - 5.96.0
 
@@ -166,8 +82,8 @@ developing applications that use %{name}.
 * Fri May 13 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.94.0-1
 - 5.94.0
 
-* Sun Apr 10 2022 Justin Zobel <justin@1707.io> - 5.93-1
+* Mon Apr 11 2022 Justin Zobel <justin@1707.io> - 5.93.0-1
-- Update to 5.93
+- Update to 5.93.0
 
 * Thu Mar 10 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.92.0-1
 - 5.92.0

sources

@@ -1 +1 @@
-SHA512 (kguiaddons-5.115.0.tar.xz) = 4416b0f9d2a9859fe2a8b24cb25405ea4eaa0670168348eaedf5a8e44ade59f582118f8ad7525e5829bac5dc6d4b56dd1e47b58e5df6bbe4226a8039a27ff5aa
+SHA512 (kguiaddons-5.96.0.tar.xz) = fccc8175de2e48405692ac4b34a703d9a0d0340b0b682f13ca26af8f44161e3e7f08821672271680f80cfdfd0d5d6c369e41548720d4a8b921f417945e698bf1