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

---
 .gitignore       | 26 --------------------------
 kf5-kcodecs.spec | 23 +++++++++++++----------
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a3df0f..6d726e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,2 @@
-/kcodecs-5.18.0.tar.xz
-/kcodecs-5.19.0.tar.xz
-/kcodecs-5.20.0.tar.xz
-/kcodecs-5.21.0.tar.xz
-/kcodecs-5.22.0.tar.xz
-/kcodecs-5.23.0.tar.xz
-/kcodecs-5.24.0.tar.xz
-/kcodecs-5.25.0.tar.xz
-/kcodecs-5.26.0.tar.xz
-/kcodecs-5.27.0.tar.xz
-/kcodecs-5.29.0.tar.xz
-/kcodecs-5.31.0.tar.xz
-/kcodecs-5.32.0.tar.xz
-/kcodecs-5.33.0.tar.xz
-/kcodecs-5.34.0.tar.xz
-/kcodecs-5.35.0.tar.xz
-/kcodecs-5.36.0.tar.xz
-/kcodecs-5.37.0.tar.xz
-/kcodecs-5.38.0.tar.xz
-/kcodecs-5.39.0.tar.xz
-/kcodecs-5.40.0.tar.xz
-/kcodecs-5.41.0.tar.xz
-/kcodecs-5.42.0.tar.xz
-/kcodecs-5.43.0.tar.xz
-/kcodecs-5.44.0.tar.xz
-/kcodecs-5.45.0.tar.xz
 /kcodecs-5.46.0.tar.xz
 /kcodecs-5.47.0.tar.xz
diff --git a/kf5-kcodecs.spec b/kf5-kcodecs.spec
index 715c58c..39b4999 100644
--- a/kf5-kcodecs.spec
+++ b/kf5-kcodecs.spec
@@ -2,28 +2,28 @@
 
 Name:           kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 1 addon with string manipulation methods
 
 License:        GPLv2+ and 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:  gperf
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qttools-devel
 
-Requires:       kf5-filesystem >= %{version}
+Requires:       kf5-filesystem >= %{majmin}
 
 %description
 KDE Frameworks 5 Tier 1 addon with string manipulation methods.
@@ -48,17 +48,16 @@ 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 kcodecs5_qt --with-qt --all-name
+%find_lang_kf5 kcodecs5_qt
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files -f kcodecs5_qt.lang
 %doc README.md
@@ -75,6 +74,10 @@ 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 %%find_lang_kf5
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0