From 0c50a71272e656df9ee0b7b1d540ee9ec46b9293 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jun 07 2018 19:13:37 +0000
Subject: cleanup, use %majmin %make_build %ldconfig_scriptlets


---

diff --git a/.gitignore b/.gitignore
index d36f62d..0da61ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,2 @@
-/kpackage-5.34.0.tar.xz
-/kpackage-5.35.0.tar.xz
-/kpackage-5.36.0.tar.xz
-/kpackage-5.37.0.tar.xz
-/kpackage-5.38.0.tar.xz
-/kpackage-5.39.0.tar.xz
-/kpackage-5.40.0.tar.xz
-/kpackage-5.41.0.tar.xz
-/kpackage-5.42.0.tar.xz
-/kpackage-5.43.0.tar.xz
-/kpackage-5.44.0.tar.xz
-/kpackage-5.45.0.tar.xz
 /kpackage-5.46.0.tar.xz
 /kpackage-5.47.0.tar.xz
diff --git a/kf5-kpackage.spec b/kf5-kpackage.spec
index 7328e5f..b6f2fd8 100644
--- a/kf5-kpackage.spec
+++ b/kf5-kpackage.spec
@@ -9,31 +9,30 @@
 
 Name:           kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 2 library to load and install packages as plugins
 
 License:        LGPLv2+
 URL:            https://cgit.kde.org/%{framework}.git
 
-%global versiondir %(echo %{version} | cut -d. -f1-2)
-%global majmin_ver %(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
 
 ## upstream patches
 
-BuildRequires:  extra-cmake-modules >= %{majmin_ver}
+BuildRequires:  extra-cmake-modules >= %{majmin}
 BuildRequires:  kf5-rpm-macros
-BuildRequires:  kf5-karchive-devel >= %{majmin_ver}
-BuildRequires:  kf5-kcoreaddons-devel >= %{majmin_ver}
-BuildRequires:  kf5-ki18n-devel >= %{majmin_ver}
+BuildRequires:  kf5-karchive-devel >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
 # optional
-BuildRequires:  kf5-kdoctools-devel >= %{majmin_ver}
+BuildRequires:  kf5-kdoctools-devel >= %{majmin}
 
 BuildRequires:  qt5-qtbase-devel
 
@@ -44,7 +43,7 @@ if they were plugins.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       extra-cmake-modules >= %{majmin_ver}
+Requires:       extra-cmake-modules >= %{majmin}
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -61,13 +60,13 @@ pushd %{_target_platform}
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kpackage5_qt --with-qt --with-man --all-name
+%find_lang %{name} --all-name --with-html --with-man
 
 # create/own dirs
 mkdir -p %{buildroot}%{_kf5_qtplugindir}/kpackage/packagestructure/
@@ -81,10 +80,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %endif
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
-%files -f kpackage5_qt.lang
+%files -f %{name}.lang
 %doc README.md
 %license COPYING.LIB
 %{_kf5_sysconfdir}/xdg/%{framework}.*
@@ -103,6 +101,9 @@ make test ARGS="--output-on-failure --timeout 30" -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