diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec index e4073c7..648361a 100644 --- a/kf5-kglobalaccel.spec +++ b/kf5-kglobalaccel.spec @@ -1,4 +1,3 @@ -%undefine __cmake_in_source_build %global framework kglobalaccel Name: kf5-%{framework} @@ -7,7 +6,7 @@ Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts License: LGPLv2+ -URL: https://cgit.kde.org/%{framework}.git +URL: https://invent.kde.org/frameworks/%{framework} %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -18,34 +17,27 @@ URL: https://cgit.kde.org/%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -Source1: kglobalaccel.service - BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-rpm-macros BuildRequires: kf5-kconfig-devel >= %{majmin} BuildRequires: kf5-kcoreaddons-devel >= %{majmin} BuildRequires: kf5-kcrash-devel >= %{majmin} BuildRequires: kf5-kdbusaddons-devel >= %{majmin} -BuildRequires: kf5-ki18n-devel >= %{majmin} -BuildRequires: kf5-kservice-devel >= %{majmin} BuildRequires: kf5-kwindowsystem-devel >= %{majmin} # for systemd-related macros BuildRequires: systemd -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtx11extras-devel +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5X11Extras) BuildRequires: xcb-util-keysyms-devel BuildRequires: libX11-devel BuildRequires: libxcb-devel - Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Conflicts: plasma-workspace < 5.2.0-8 - %description %{summary}. @@ -69,16 +61,14 @@ developing applications that use %{name}. %build -%{cmake_kf5} +%cmake_kf5 + %cmake_build %install %cmake_install -install -p -D %{SOURCE1} %{buildroot}%{_userunitdir}/kglobalaccel.service -echo 'SystemdService=kglobalaccel.service' >> %{buildroot}%{_datadir}/dbus-1/services/org.kde.kglobalaccel.service - %find_lang_kf5 kglobalaccel5_qt @@ -89,7 +79,7 @@ echo 'SystemdService=kglobalaccel.service' >> %{buildroot}%{_datadir}/dbus-1/ser %{_kf5_bindir}/kglobalaccel5 %{_kf5_datadir}/kservices5/kglobalaccel5.desktop %{_datadir}/dbus-1/services/org.kde.kglobalaccel.service -%{_userunitdir}/kglobalaccel.service +%{_userunitdir}/plasma-kglobalaccel.service %ldconfig_scriptlets libs @@ -110,9 +100,11 @@ echo 'SystemdService=kglobalaccel.service' >> %{buildroot}%{_datadir}/dbus-1/ser %changelog * Thu Nov 19 09:02:11 CST 2020 Rex Dieter - 5.76.0-1 - 5.76.0 +- .spec cleanup, update URL +- use upstream kglobalaccel.service implementation * Wed Oct 14 2020 Rex Dieter - 5.75.0-2 -- sytemd kglobalaccel.service (#1861700) +- systemd kglobalaccel.service (#1861700) * Wed Oct 14 09:54:23 CDT 2020 Rex Dieter - 5.75.0-1 - 5.75.0