Re-enable building kglobalaccel runtime code

We still need it until kwin is upgraded to v6...
epel9
Neal Gompa 1 year ago
parent 39c9570c40
commit 5122667b9e

@ -1,8 +1,10 @@
%bcond build_runtime 1
%global framework kglobalaccel %global framework kglobalaccel
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.110.0 Version: 5.110.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts
License: LGPLv2+ License: LGPLv2+
@ -58,12 +60,7 @@ developing applications that use %{name}.
%build %build
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 %cmake_kf5 %{?!with_build_runtime:-DBUILD_RUNTIME=OFF}
# Added flag is for co-instability with KF6
%cmake_kf5 -DBUILD_RUNTIME=OFF
%else
%cmake_kf5
%endif
%cmake_build %cmake_build
@ -71,7 +68,7 @@ developing applications that use %{name}.
%cmake_install %cmake_install
# unpackaged files # unpackaged files
%if 0%{?flatpak:1} %if 0%{?flatpak:1} && %{with build_runtime}
rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service
%endif %endif
@ -83,28 +80,25 @@ rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service
%doc README.md %doc README.md
%license LICENSES/*.txt %license LICENSES/*.txt
%{_kf5_datadir}/qlogging-categories5/%{framework}* %{_kf5_datadir}/qlogging-categories5/%{framework}*
%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) %if %{with build_runtime}
%{_kf5_bindir}/kglobalaccel5 %{_kf5_bindir}/kglobalaccel5
%{_kf5_datadir}/kservices5/kglobalaccel5.desktop %{_kf5_datadir}/kservices5/kglobalaccel5.desktop
%{_datadir}/dbus-1/services/org.kde.kglobalaccel.service %{_datadir}/dbus-1/services/org.kde.kglobalaccel.service
%endif %endif
%if ! 0%{?flatpak:1} %if ! 0%{?flatpak:1}
%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10) %if %{with build_runtime}
%{_userunitdir}/plasma-kglobalaccel.service %{_userunitdir}/plasma-kglobalaccel.service
%endif %endif
%endif %endif
%ldconfig_scriptlets libs
%files libs %files libs
%{_kf5_libdir}/libKF5GlobalAccel.so.* %{_kf5_libdir}/libKF5GlobalAccel.so.*
%if ! 0%{?fedora} >= 40 || !0%{?rhel} > 10 %if %{with build_runtime}
%{_kf5_libdir}/libKF5GlobalAccelPrivate.so.* %{_kf5_libdir}/libKF5GlobalAccelPrivate.so.*
%{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/ %{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/
%endif %endif
%files devel %files devel
%{_kf5_includedir}/KGlobalAccel/ %{_kf5_includedir}/KGlobalAccel/
%{_kf5_libdir}/libKF5GlobalAccel.so %{_kf5_libdir}/libKF5GlobalAccel.so
%{_kf5_libdir}/cmake/KF5GlobalAccel/ %{_kf5_libdir}/cmake/KF5GlobalAccel/
@ -113,6 +107,9 @@ rm -fv %{buildroot}%{_prefix}/lib/systemd/user/plasma-kglobalaccel.service
%changelog %changelog
* Mon Oct 09 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.110.0-4
- Re-enable building kglobalaccel runtime code
* Sun Oct 08 2023 Steve Cossette <farchord@gmail.com> - 5.110.0-3 * Sun Oct 08 2023 Steve Cossette <farchord@gmail.com> - 5.110.0-3
- Added logic and build flag for co-installation with KF6 - Added logic and build flag for co-installation with KF6

Loading…
Cancel
Save