From b65cfc4ed5509b073d2e95b2e00a90f98f10bb90 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jun 08 2018 18:29:06 +0000
Subject: cleanup, use %majmin %make_build %ldconfig_scriptlets


---

diff --git a/.gitignore b/.gitignore
index 3f09cb5..ee88f34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1 @@
-/kservice-5.36.0.tar.xz
-/kservice-5.37.0.tar.xz
-/kservice-5.38.0.tar.xz
-/kservice-5.39.0.tar.xz
-/kservice-5.40.0.tar.xz
-/kservice-5.41.0.tar.xz
-/kservice-5.42.0.tar.xz
-/kservice-5.43.0.tar.xz
-/kservice-5.44.0.tar.xz
-/kservice-5.45.0.tar.xz
-/kservice-5.46.0.tar.xz
 /kservice-5.47.0.tar.xz
diff --git a/kf5-kservice.spec b/kf5-kservice.spec
index b7c97b2..24a76e5 100644
--- a/kf5-kservice.spec
+++ b/kf5-kservice.spec
@@ -3,20 +3,20 @@
 Name:    kf5-%{framework}
 Summary: KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # mixture of LGPLv2 and LGPLv2+ (mostly the latter)
 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
 
 ## upstream patches
 
@@ -34,20 +34,19 @@ Patch101:  kservice-5.17.0-vfolder_spam.patch
 # Workaround flex bug (https://bugzilla.redhat.com/show_bug.cgi?id=1364943)
 Patch102:  kservice-5.36-fix-build-with-flex-2.6.0.patch
 
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kconfig-devel >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-kcrash-devel >= %{version}
-BuildRequires:  kf5-kdbusaddons-devel >= %{version}
-BuildRequires:  kf5-kdoctools-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-kconfig-devel >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-kcrash-devel >= %{majmin}
+BuildRequires:  kf5-kdbusaddons-devel >= %{majmin}
+BuildRequires:  kf5-kdoctools-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
 
 BuildRequires:  flex
 BuildRequires:  bison
 
-Requires:       kf5-filesystem >= %{version}
 # for the Administration category
 Requires:       redhat-menus
 
@@ -58,8 +57,8 @@ introspection.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       kf5-kconfig-devel >= %{version}
-Requires:       kf5-kcoreaddons-devel >= %{version}
+Requires:       kf5-kconfig-devel >= %{majmin}
+Requires:       kf5-kcoreaddons-devel >= %{majmin}
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -75,7 +74,7 @@ pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
@@ -90,8 +89,7 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservices5
 mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files -f %{name}.lang
 %doc README.md
@@ -114,6 +112,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5
 
 
 %changelog
+* Fri Jun 08 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