From c32e59bbf1eb342817063c63a5bfb30cc1bc665b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 7 Jun 2018 14:17:57 -0500
Subject: [PATCH] cleanup, use %majmin %make_build %ldconfig_scriptlets

---
 .gitignore               | 27 ---------------------------
 kf5-kunitconversion.spec | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8838449..45d2142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1 @@
-/kunitconversion-5.18.0.tar.xz
-/kunitconversion-5.19.0.tar.xz
-/kunitconversion-5.20.0.tar.xz
-/kunitconversion-5.21.0.tar.xz
-/kunitconversion-5.22.0.tar.xz
-/kunitconversion-5.23.0.tar.xz
-/kunitconversion-5.24.0.tar.xz
-/kunitconversion-5.25.0.tar.xz
-/kunitconversion-5.26.0.tar.xz
-/kunitconversion-5.27.0.tar.xz
-/kunitconversion-5.29.0.tar.xz
-/kunitconversion-5.31.0.tar.xz
-/kunitconversion-5.32.0.tar.xz
-/kunitconversion-5.33.0.tar.xz
-/kunitconversion-5.34.0.tar.xz
-/kunitconversion-5.35.0.tar.xz
-/kunitconversion-5.36.0.tar.xz
-/kunitconversion-5.37.0.tar.xz
-/kunitconversion-5.38.0.tar.xz
-/kunitconversion-5.39.0.tar.xz
-/kunitconversion-5.40.0.tar.xz
-/kunitconversion-5.41.0.tar.xz
-/kunitconversion-5.42.0.tar.xz
-/kunitconversion-5.43.0.tar.xz
-/kunitconversion-5.44.0.tar.xz
-/kunitconversion-5.45.0.tar.xz
-/kunitconversion-5.46.0.tar.xz
 /kunitconversion-5.47.0.tar.xz
diff --git a/kf5-kunitconversion.spec b/kf5-kunitconversion.spec
index d3ebc7c..6e0e9f1 100755
--- a/kf5-kunitconversion.spec
+++ b/kf5-kunitconversion.spec
@@ -2,28 +2,26 @@
 
 Name:           kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 2 addon for unit conversions
 
 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-ki18n-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
 
-Requires:       kf5-filesystem >= %{version}
-
 %description
 KDE Frameworks 5 Tier 2 addon for unit conversions.
 
@@ -46,19 +44,18 @@ 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}
 
-%find_lang kunitconversion5_qt --with-qt --all-name
+%find_lang %{name} --all-name --with-man --with-html
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
-%files -f kunitconversion5_qt.lang
+%files -f %{name}.lang
 %doc README.md
 %license COPYING.LIB
 %{_kf5_libdir}/libKF5UnitConversion.so.*
@@ -72,6 +69,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup, use %%majmin %%make_build %%ldconfig_scriptlets
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0