From 8632f1744afa7fefac9c2c49b9f70f4a1b491928 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 1 May 2024 01:47:52 +0300 Subject: [PATCH] import kf5-kglobalaccel-5.115.0-1.el9 --- .gitignore | 2 +- .kf5-kglobalaccel.metadata | 2 +- SOURCES/kglobalaccel.service | 7 ---- SPECS/kf5-kglobalaccel.spec | 79 ++++++++++++++++++++++++++++++++---- 4 files changed, 73 insertions(+), 17 deletions(-) delete mode 100644 SOURCES/kglobalaccel.service diff --git a/.gitignore b/.gitignore index 2201f64..d5e06f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/kglobalaccel-5.108.0.tar.xz +SOURCES/kglobalaccel-5.115.0.tar.xz diff --git a/.kf5-kglobalaccel.metadata b/.kf5-kglobalaccel.metadata index 44c55cf..622532e 100644 --- a/.kf5-kglobalaccel.metadata +++ b/.kf5-kglobalaccel.metadata @@ -1 +1 @@ -9b790165ae0a8f253e653d0d00d66f978b73da68 SOURCES/kglobalaccel-5.108.0.tar.xz +3160ab1a62c2991da491312d1818026613fa8fa4 SOURCES/kglobalaccel-5.115.0.tar.xz diff --git a/SOURCES/kglobalaccel.service b/SOURCES/kglobalaccel.service deleted file mode 100644 index cb3707c..0000000 --- a/SOURCES/kglobalaccel.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=KGlobalaccel - -[Service] -Type=dbus -BusName=org.kde.kglobalaccel -ExecStart=/usr/bin/kglobalaccel5 diff --git a/SPECS/kf5-kglobalaccel.spec b/SPECS/kf5-kglobalaccel.spec index 59059e4..17d4a1b 100644 --- a/SPECS/kf5-kglobalaccel.spec +++ b/SPECS/kf5-kglobalaccel.spec @@ -1,11 +1,13 @@ +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + %global framework kglobalaccel Name: kf5-%{framework} -Version: 5.108.0 +Version: 5.115.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts -License: LGPLv2+ +License: CC0-1.0 AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) URL: https://invent.kde.org/frameworks/%{framework} %global majmin %majmin_ver_kf5 @@ -35,6 +37,10 @@ BuildRequires: libxcb-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%if %{without kf6_compat} +Conflicts: kglobalacceld +%endif + %description %{summary}. @@ -58,8 +64,7 @@ developing applications that use %{name}. %build -%cmake_kf5 - +%cmake_kf5 %{?with_kf6_compat:-DBUILD_RUNTIME=OFF} %cmake_build @@ -79,22 +84,23 @@ rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service %doc README.md %license LICENSES/*.txt %{_kf5_datadir}/qlogging-categories5/%{framework}* +%if %{without kf6_compat} %{_kf5_bindir}/kglobalaccel5 %{_kf5_datadir}/kservices5/kglobalaccel5.desktop %{_datadir}/dbus-1/services/org.kde.kglobalaccel.service %if ! 0%{?flatpak:1} %{_userunitdir}/plasma-kglobalaccel.service %endif - -%ldconfig_scriptlets libs +%endif %files libs %{_kf5_libdir}/libKF5GlobalAccel.so.* +%if %{without kf6_compat} %{_kf5_libdir}/libKF5GlobalAccelPrivate.so.* %{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/ +%endif %files devel - %{_kf5_includedir}/KGlobalAccel/ %{_kf5_libdir}/libKF5GlobalAccel.so %{_kf5_libdir}/cmake/KF5GlobalAccel/ @@ -103,9 +109,66 @@ rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service %changelog -* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-1 +* Sat Feb 10 2024 Marc Deop i Argemí - 5.115.0-1 +- 5.115.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 5.113.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.113.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marc Deop i Argemí - 5.113.0-1 +- 5.113.0 + +* Sun Dec 03 2023 Alessandro Astone - 5.111.0-10 +- Don't require kglobalacceld + +* Mon Nov 20 2023 Steve Cossette - 5.111.0-9 +- Preparation for Plasma 6 + +* Mon Nov 20 2023 Alessandro Astone - 5.111.0-8 +- Conflicts kglobalacceld + +* Mon Nov 20 2023 Alessandro Astone - 5.111.0-7 +- Remove Obsoletes kglobalacceld + +* Tue Oct 24 2023 Alessandro Astone - 5.111.0-6 +- Add Obsoletes: to upgrade from the compat build + +* Tue Oct 24 2023 Alessandro Astone - 5.111.0-5 +- Re-enable the daemon until Plasma 6 + +* Wed Oct 18 2023 Alessandro Astone - 5.111.0-4 +- Require the new kglobalacceld if compat build + +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-3 +- Require kf6-kglobalaccel if compat build + +* Thu Oct 12 2023 Alessandro Astone - 5.111.0-2 +- Backport patch for KF6 coinstallability + +* Tue Oct 10 2023 Marc Deop i Argemí - 5.111.0-1 +- 5.111.0 + +* Mon Oct 09 2023 Neal Gompa - 5.110.0-4 +- Re-enable building kglobalaccel runtime code + +* Sun Oct 08 2023 Steve Cossette - 5.110.0-3 +- Added logic and build flag for co-installation with KF6 + +* Tue Sep 05 2023 Marc Deop i Argemí - 5.110.0-1 +- 5.110.0 + +* Sat Aug 05 2023 Marc Deop i Argemí - 5.109.0-1 +- 5.109.0 + +* Wed Jul 26 2023 Arkady L. Shane - 5.108.0-2 - Rebuilt for MSVSphere 9.2 +* Thu Jul 20 2023 Fedora Release Engineering - 5.108.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jul 02 2023 Marc Deop i Argemí - 5.108.0-1 - 5.108.0