From 7d1b62e387b22a2f2905bcf96281a25e7916c4d7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Dec 2017 14:46:35 -0600 Subject: [PATCH] cleanup, fix build --- .gitignore | 21 --------------------- kf5-kitemmodels.spec | 16 ++++++++-------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 0c9afbf..1385035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1 @@ -/kitemmodels-5.18.0.tar.xz -/kitemmodels-5.19.0.tar.xz -/kitemmodels-5.20.0.tar.xz -/kitemmodels-5.21.0.tar.xz -/kitemmodels-5.22.0.tar.xz -/kitemmodels-5.23.0.tar.xz -/kitemmodels-5.24.0.tar.xz -/kitemmodels-5.25.0.tar.xz -/kitemmodels-5.26.0.tar.xz -/kitemmodels-5.27.0.tar.xz -/kitemmodels-5.29.0.tar.xz -/kitemmodels-5.31.0.tar.xz -/kitemmodels-5.32.0.tar.xz -/kitemmodels-5.33.0.tar.xz -/kitemmodels-5.34.0.tar.xz -/kitemmodels-5.35.0.tar.xz -/kitemmodels-5.36.0.tar.xz -/kitemmodels-5.37.0.tar.xz -/kitemmodels-5.38.0.tar.xz -/kitemmodels-5.39.0.tar.xz -/kitemmodels-5.40.0.tar.xz /kitemmodels-5.41.0.tar.xz diff --git a/kf5-kitemmodels.spec b/kf5-kitemmodels.spec index d2df582..7bae938 100644 --- a/kf5-kitemmodels.spec +++ b/kf5-kitemmodels.spec @@ -8,22 +8,21 @@ Summary: KDE Frameworks 5 Tier 1 addon with item models License: LGPLv2+ URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt5-qtscript-devel +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros -Requires: kf5-filesystem >= %{version} +BuildRequires: cmake(Qt5Core) + +Requires: kf5-filesystem %description KDE Frameworks 5 Tier 1 addon with item models. @@ -60,6 +59,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files %doc README.md %license COPYING.LIB +%{_kf5_sysconfdir}/xdg/%{framework}.* %{_kf5_libdir}/libKF5ItemModels.so.* %files devel