From fd22b1a0effee54c07fda5397fe100f9b8cf09d6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Fri, 8 Jun 2018 11:55:22 -0500
Subject: [PATCH] cleanup, use %majmin %make_build %ldconfig_scriptlets

---
 .gitignore       | 27 --------------------------
 kf5-kpeople.spec | 49 +++++++++++++++++++++---------------------------
 2 files changed, 21 insertions(+), 55 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a1ed0c..8885753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1 @@
-/kpeople-5.18.0.tar.xz
-/kpeople-5.19.0.tar.xz
-/kpeople-5.20.0.tar.xz
-/kpeople-5.21.0.tar.xz
-/kpeople-5.22.0.tar.xz
-/kpeople-5.23.0.tar.xz
-/kpeople-5.24.0.tar.xz
-/kpeople-5.25.0.tar.xz
-/kpeople-5.26.0.tar.xz
-/kpeople-5.27.0.tar.xz
-/kpeople-5.29.0.tar.xz
-/kpeople-5.31.0.tar.xz
-/kpeople-5.32.0.tar.xz
-/kpeople-5.33.0.tar.xz
-/kpeople-5.34.0.tar.xz
-/kpeople-5.35.0.tar.xz
-/kpeople-5.36.0.tar.xz
-/kpeople-5.37.0.tar.xz
-/kpeople-5.38.0.tar.xz
-/kpeople-5.39.0.tar.xz
-/kpeople-5.40.0.tar.xz
-/kpeople-5.41.0.tar.xz
-/kpeople-5.42.0.tar.xz
-/kpeople-5.43.0.tar.xz
-/kpeople-5.44.0.tar.xz
-/kpeople-5.45.0.tar.xz
-/kpeople-5.46.0.tar.xz
 /kpeople-5.47.0.tar.xz
diff --git a/kf5-kpeople.spec b/kf5-kpeople.spec
index 6510e63..b21ffd7 100644
--- a/kf5-kpeople.spec
+++ b/kf5-kpeople.spec
@@ -1,41 +1,35 @@
 %global framework kpeople
 
-Name:           kf5-%{framework}
+Name:    kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
-Summary:        KDE Frameworks 5 Tier 3 library for contact and people aggregation
+Release: 2%{?dist}
+Summary: KDE Frameworks 5 Tier 3 library for contact and people aggregation
 
-License:        LGPLv2+
-URL:            https://cgit.kde.org/%{framework}.git
+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
-
-%if 0%{?fedora} > 23
-Obsoletes: libkpeople < 1.0
-%endif
+Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 # filter qml provides
 %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$
 
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
-BuildRequires:  kf5-kitemviews-devel >= %{version}
-BuildRequires:  kf5-kservice-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-kitemviews-devel >= %{majmin}
+BuildRequires:  kf5-kservice-devel >= %{majmin}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 
-Requires:       kf5-filesystem >= %{version}
-
 %description
 KDE Frameworks 5 Tier 3 library for interaction with XML RPC services.
 
@@ -43,9 +37,6 @@ KDE Frameworks 5 Tier 3 library for interaction with XML RPC services.
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       qt5-qtbase-devel
-%if 0%{?fedora} > 23
-Obsoletes:      libkpeople-devel < 1.0
-%endif
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -62,19 +53,18 @@ pushd %{_target_platform}
     -DENABLE_EXAMPLES:BOOL=OFF
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kpeople5_qt --with-qt --all-name
+%find_lang %{name} --all-name
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
-%files -f kpeople5_qt.lang
+%files -f %{name}.lang
 %doc README.md
 %license COPYING
 %{_kf5_libdir}/libKF5People.so.*
@@ -95,6 +85,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %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