From e64d6b7f0bcca0139806e9718756926a1fd2c00e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 14 Jan 2016 07:33:29 -0600 Subject: [PATCH] cosmetics, update URL, use %license --- .gitignore | 20 -------------------- kf5-karchive.spec | 28 ++++++++++++++++------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 6ea97c7..14b0ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1 @@ -/karchive-4.99.0.tar.xz -/karchive-4.100.0.tar.xz -/karchive-5.0.0.tar.xz -/karchive-5.1.0.tar.xz -/karchive-5.2.0.tar.xz -/karchive-5.3.0.tar.xz -/karchive-5.4.0.tar.xz -/karchive-5.5.0.tar.xz -/karchive-5.6.0.tar.xz -/karchive-5.7.0.tar.xz -/karchive-5.8.0.tar.xz -/karchive-5.9.0.tar.xz -/karchive-5.10.0.tar.xz -/karchive-5.11.0.tar.xz -/karchive-5.12.0.tar.xz -/karchive-5.13.0.tar.xz -/karchive-5.14.0.tar.xz -/karchive-5.15.0.tar.xz -/karchive-5.16.0.tar.xz -/karchive-5.17.0.tar.xz /karchive-5.18.0.tar.xz diff --git a/kf5-karchive.spec b/kf5-karchive.spec index bbd8bfb..2fe970e 100644 --- a/kf5-karchive.spec +++ b/kf5-karchive.spec @@ -2,11 +2,11 @@ Name: kf5-%{framework} Version: 5.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with archive functions License: LGPLv2+ and BSD -URL: http://www.kde.org +URL: http://projects.kde.org/karchive %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -17,13 +17,12 @@ URL: http://www.kde.org %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -BuildRequires: zlib-devel BuildRequires: bzip2-devel -BuildRequires: xz-devel - -BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: extra-cmake-modules >= %{version} +BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel +BuildRequires: xz-devel +BuildRequires: zlib-devel Requires: kf5-filesystem >= %{version} @@ -35,7 +34,6 @@ KDE Frameworks 5 Tier 1 addon with archive functions. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -44,34 +42,40 @@ 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 -C %{_target_platform} +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING COPYING.LIB README.md +%doc AUTHORS README.md +%license COPYING COPYING.LIB %{_kf5_libdir}/libKF5Archive.so.* %files devel %{_kf5_includedir}/karchive_version.h -%{_kf5_includedir}/KArchive +%{_kf5_includedir}/KArchive/ %{_kf5_libdir}/libKF5Archive.so -%{_kf5_libdir}/cmake/KF5Archive +%{_kf5_libdir}/cmake/KF5Archive/ %{_kf5_archdatadir}/mkspecs/modules/qt_KArchive.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