diff --git a/.gitignore b/.gitignore index 4cf5b14..a43b74e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/kglobalaccel-4.99.0.tar.xz -/kglobalaccel-4.100.0.tar.xz -/kglobalaccel-5.0.0.tar.xz -/kglobalaccel-5.1.0.tar.xz -/kglobalaccel-5.2.0.tar.xz -/kglobalaccel-5.3.0.tar.xz -/kglobalaccel-5.4.0.tar.xz -/kglobalaccel-5.5.0.tar.xz -/kglobalaccel-5.6.0.tar.xz -/kglobalaccel-5.7.0.tar.xz -/kglobalaccel-5.8.0.tar.xz -/kglobalaccel-5.9.0.tar.xz -/kglobalaccel-5.10.0.tar.xz -/kglobalaccel-5.11.0.tar.xz -/kglobalaccel-5.12.0.tar.xz -/kglobalaccel-5.13.0.tar.xz -/kglobalaccel-5.14.0.tar.xz -/kglobalaccel-5.15.0.tar.xz -/kglobalaccel-5.16.0.tar.xz -/kglobalaccel-5.17.0.tar.xz /kglobalaccel-5.18.0.tar.xz diff --git a/kf5-kglobalaccel.spec b/kf5-kglobalaccel.spec index 980c7c9..4eddc26 100644 --- a/kf5-kglobalaccel.spec +++ b/kf5-kglobalaccel.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for global shortcuts License: LGPLv2+ -URL: http://www.kde.org +URL: http://projects.kde.org/kglobalaccel %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -17,34 +17,28 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -## upstream patches - -BuildRequires: libX11-devel - -BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-qttools-devel BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kcrash-devel >= %{version} -BuildRequires: kf5-kwindowsystem-devel >= %{version} -BuildRequires: kf5-kdbusaddons-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} - BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kcoreaddons-devel >= %{version} +BuildRequires: kf5-kcoreaddons-devel >= %{version} +BuildRequires: kf5-kcrash-devel >= %{version} BuildRequires: kf5-kcrash-devel >= %{version} BuildRequires: kf5-kdbusaddons-devel >= %{version} +BuildRequires: kf5-kdbusaddons-devel >= %{version} BuildRequires: kf5-ki18n-devel >= %{version} BuildRequires: kf5-kwindowsystem-devel >= %{version} - +BuildRequires: kf5-kwindowsystem-devel >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: libX11-devel BuildRequires: libxcb-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qtx11extras-devel BuildRequires: xcb-util-keysyms-devel -Requires: kf5-filesystem >= %{version} - Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: kf5-filesystem >= %{version} Conflicts: plasma-workspace < 5.2.0-8 @@ -61,7 +55,6 @@ Requires: %{name} = %{version}-%{release} Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -70,6 +63,7 @@ developing applications that use %{name}. %prep %autosetup -p1 -n %{framework}-%{version} + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -78,18 +72,19 @@ popd make %{?_smp_mflags} -C %{_target_platform} + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} - %find_lang_kf5 kglobalaccel5_qt + %files -f kglobalaccel5_qt.lang -%doc COPYING.LIB README.md +%doc README.md +%license COPYING.LIB %{_kf5_bindir}/kglobalaccel5 %{_kf5_datadir}/kservices5/kglobalaccel5.desktop %{_datadir}/dbus-1/services/org.kde.kglobalaccel.service -%{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateXcb.so %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -97,6 +92,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files libs %{_kf5_libdir}/libKF5GlobalAccel.so.* %{_kf5_libdir}/libKF5GlobalAccelPrivate.so.* +%{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/ %files devel %{_kf5_includedir}/kglobalaccel_version.h @@ -108,6 +104,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-2 +- cosmetics, update URL, use %%license, move plugins to -libs + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0