From a2a2aca535b6cb87ceb92e32eca607daf8dcffbe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 7 Jun 2018 11:04:52 -0500 Subject: [PATCH] cleanup use %majmin %make_build %ldconfig_scriptlets --- .gitignore | 46 ---------------------------------------------- kf5-attica.spec | 17 ++++++++++------- 2 files changed, 10 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 7f6d014..6bfa730 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,2 @@ -/attica-4.99.0.tar.xz -/attica-4.100.0.tar.xz -/attica-5.0.0.tar.xz -/attica-5.1.0.tar.xz -/attica-5.2.0.tar.xz -/attica-5.3.0.tar.xz -/attica-5.4.0.tar.xz -/attica-5.5.0.tar.xz -/attica-5.6.0.tar.xz -/attica-5.7.0.tar.xz -/attica-5.8.0.tar.xz -/attica-5.9.0.tar.xz -/attica-5.10.0.tar.xz -/attica-5.11.0.tar.xz -/attica-5.12.0.tar.xz -/attica-5.13.0.tar.xz -/attica-5.14.0.tar.xz -/attica-5.15.0.tar.xz -/attica-5.16.0.tar.xz -/attica-5.17.0.tar.xz -/attica-5.18.0.tar.xz -/attica-5.19.0.tar.xz -/attica-5.20.0.tar.xz -/attica-5.21.0.tar.xz -/attica-5.22.0.tar.xz -/attica-5.23.0.tar.xz -/attica-5.24.0.tar.xz -/attica-5.25.0.tar.xz -/attica-5.26.0.tar.xz -/attica-5.27.0.tar.xz -/attica-5.29.0.tar.xz -/attica-5.31.0.tar.xz -/attica-5.32.0.tar.xz -/attica-5.33.0.tar.xz -/attica-5.34.0.tar.xz -/attica-5.35.0.tar.xz -/attica-5.36.0.tar.xz -/attica-5.37.0.tar.xz -/attica-5.38.0.tar.xz -/attica-5.39.0.tar.xz -/attica-5.40.0.tar.xz -/attica-5.41.0.tar.xz -/attica-5.42.0.tar.xz -/attica-5.43.0.tar.xz -/attica-5.44.0.tar.xz -/attica-5.45.0.tar.xz /attica-5.46.0.tar.xz /attica-5.47.0.tar.xz diff --git a/kf5-attica.spec b/kf5-attica.spec index 4dbcda9..7a84cef 100644 --- a/kf5-attica.spec +++ b/kf5-attica.spec @@ -2,26 +2,26 @@ Name: kf5-attica Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks Tier 1 Addon with Open Collaboration Services API 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 -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} %description Attica is a Qt library that implements the Open Collaboration Services @@ -45,15 +45,14 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc AUTHORS ChangeLog README.md @@ -71,6 +70,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup +- use %%majmin %%make_build %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0