From 699eb24928c40bdcf03db2346653d381c2366c6b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 7 Jun 2018 11:06:54 -0500
Subject: [PATCH] cleanup %majmin %make_build %ldconfig_scriptlets

---
 .gitignore        | 26 --------------------------
 kf5-karchive.spec | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3430d79..6a6488a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,2 @@
-/karchive-5.18.0.tar.xz
-/karchive-5.19.0.tar.xz
-/karchive-5.20.0.tar.xz
-/karchive-5.21.0.tar.xz
-/karchive-5.22.0.tar.xz
-/karchive-5.23.0.tar.xz
-/karchive-5.24.0.tar.xz
-/karchive-5.25.0.tar.xz
-/karchive-5.26.0.tar.xz
-/karchive-5.27.0.tar.xz
-/karchive-5.29.0.tar.xz
-/karchive-5.31.0.tar.xz
-/karchive-5.32.0.tar.xz
-/karchive-5.33.0.tar.xz
-/karchive-5.34.0.tar.xz
-/karchive-5.35.0.tar.xz
-/karchive-5.36.0.tar.xz
-/karchive-5.37.0.tar.xz
-/karchive-5.38.0.tar.xz
-/karchive-5.39.0.tar.xz
-/karchive-5.40.0.tar.xz
-/karchive-5.41.0.tar.xz
-/karchive-5.42.0.tar.xz
-/karchive-5.43.0.tar.xz
-/karchive-5.44.0.tar.xz
-/karchive-5.45.0.tar.xz
 /karchive-5.46.0.tar.xz
 /karchive-5.47.0.tar.xz
diff --git a/kf5-karchive.spec b/kf5-karchive.spec
index ca1a0c6..f08e0f6 100644
--- a/kf5-karchive.spec
+++ b/kf5-karchive.spec
@@ -2,20 +2,20 @@
 
 Name:           kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 1 addon with archive functions
 
 License:        LGPLv2+ and BSD
 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:  bzip2-devel
 BuildRequires:  extra-cmake-modules >= %{version}
@@ -24,12 +24,11 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 
-Requires:       kf5-filesystem >= %{version}
+Requires:       kf5-filesystem >= %{majmin}
 
 %description
 KDE Frameworks 5 Tier 1 addon with archive functions.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -49,15 +48,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 README.md
@@ -74,6 +72,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup
+- %%majmin %%make_build %%ldconfig_scriptlets
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0