From 92b038c04b4d18864a06ca66d72fd2e18f0f0fcb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 10:55:24 -0600 Subject: [PATCH] cosmetics, update URL, use %license --- .gitignore | 19 ------------------- kf5-kjobwidgets.spec | 32 ++++++++++++++++++-------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 0094649..5d536f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1 @@ -/kjobwidgets-4.100.0.tar.xz -/kjobwidgets-5.0.0.tar.xz -/kjobwidgets-5.1.0.tar.xz -/kjobwidgets-5.2.0.tar.xz -/kjobwidgets-5.3.0.tar.xz -/kjobwidgets-5.4.0.tar.xz -/kjobwidgets-5.5.0.tar.xz -/kjobwidgets-5.6.0.tar.xz -/kjobwidgets-5.7.0.tar.xz -/kjobwidgets-5.8.0.tar.xz -/kjobwidgets-5.9.0.tar.xz -/kjobwidgets-5.10.0.tar.xz -/kjobwidgets-5.11.0.tar.xz -/kjobwidgets-5.12.0.tar.xz -/kjobwidgets-5.13.0.tar.xz -/kjobwidgets-5.14.0.tar.xz -/kjobwidgets-5.15.0.tar.xz -/kjobwidgets-5.16.0.tar.xz -/kjobwidgets-5.17.0.tar.xz /kjobwidgets-5.18.0.tar.xz diff --git a/kf5-kjobwidgets.spec b/kf5-kjobwidgets.spec index 40a174f..eb32892 100755 --- a/kf5-kjobwidgets.spec +++ b/kf5-kjobwidgets.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 2 addon for KJobs License: LGPLv2+ -URL: http://www.kde.org +URL: http://projects.kde.org/kjobwidgets %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -17,16 +17,14 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -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-kcoreaddons-devel >= %{version} BuildRequires: kf5-kwidgetsaddons-devel >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: libX11-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qtx11extras-devel Requires: kf5-filesystem >= %{version} @@ -38,7 +36,6 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel Requires: kf5-kcoreaddons-devel >= %{version} - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -47,16 +44,19 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} + %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} + %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + %find_lang kjobwidgets5_qt --with-qt --all-name @@ -64,19 +64,23 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %postun -p /sbin/ldconfig %files -f kjobwidgets5_qt.lang -%doc COPYING.LIB README.md +%doc README.md +%license COPYING.LIB %{_kf5_libdir}/libKF5JobWidgets.so.* %files devel %{_kf5_includedir}/kjobwidgets_version.h -%{_kf5_includedir}/KJobWidgets +%{_kf5_includedir}/KJobWidgets/ %{_kf5_libdir}/libKF5JobWidgets.so -%{_kf5_libdir}/cmake/KF5JobWidgets +%{_kf5_libdir}/cmake/KF5JobWidgets/ %{_kf5_datadir}/dbus-1/interfaces/*.xml %{_kf5_archdatadir}/mkspecs/modules/qt_KJobWidgets.pri %changelog +* Thu Jan 14 2016 Rex Dieter 5.18.0-2 +- cosmetics, update URL, use %%license + * Sun Jan 03 2016 Daniel Vrátil - 5.18.0-1 - KDE Frameworks 5.18.0