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

---
 .gitignore           | 25 ------------------
 kf5-kactivities.spec | 60 +++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/.gitignore b/.gitignore
index 646cda7..a51e8fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1 @@
-/kactivities-5.20.0.tar.xz
-/kactivities-5.21.0.tar.xz
-/kactivities-5.22.0.tar.xz
-/kactivities-5.23.0.tar.xz
-/kactivities-5.24.0.tar.xz
-/kactivities-5.25.0.tar.xz
-/kactivities-5.26.0.tar.xz
-/kactivities-5.27.0.tar.xz
-/kactivities-5.29.0.tar.xz
-/kactivities-5.31.0.tar.xz
-/kactivities-5.32.0.tar.xz
-/kactivities-5.33.0.tar.xz
-/kactivities-5.34.0.tar.xz
-/kactivities-5.35.0.tar.xz
-/kactivities-5.36.0.tar.xz
-/kactivities-5.37.0.tar.xz
-/kactivities-5.38.0.tar.xz
-/kactivities-5.39.0.tar.xz
-/kactivities-5.40.0.tar.xz
-/kactivities-5.41.0.tar.xz
-/kactivities-5.42.0.tar.xz
-/kactivities-5.43.0.tar.xz
-/kactivities-5.44.0.tar.xz
-/kactivities-5.45.0.tar.xz
-/kactivities-5.46.0.tar.xz
 /kactivities-5.47.0.tar.xz
diff --git a/kf5-kactivities.spec b/kf5-kactivities.spec
index 138168c..c7171fc 100644
--- a/kf5-kactivities.spec
+++ b/kf5-kactivities.spec
@@ -3,54 +3,48 @@
 Name:           kf5-%{framework}
 Summary:        A KDE Frameworks 5 Tier 3 to organize user work into separate activities
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License:        GPLv2+ and 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:  boost-devel
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kcmutils-devel >= %{version}
-BuildRequires:  kf5-kconfig-devel >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-kdbusaddons-devel >= %{version}
-BuildRequires:  kf5-kdeclarative-devel >= %{version}
-BuildRequires:  kf5-kglobalaccel-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
-BuildRequires:  kf5-kio-devel >= %{version}
-BuildRequires:  kf5-kservice-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-BuildRequires:  kf5-kwindowsystem-devel >= %{version}
-BuildRequires:  kf5-kxmlgui-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-kcmutils-devel >= %{majmin}
+BuildRequires:  kf5-kconfig-devel >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-kdbusaddons-devel >= %{majmin}
+BuildRequires:  kf5-kdeclarative-devel >= %{majmin}
+BuildRequires:  kf5-kglobalaccel-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-kio-devel >= %{majmin}
+BuildRequires:  kf5-kservice-devel >= %{majmin}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
+BuildRequires:  kf5-kwindowsystem-devel >= %{majmin}
+BuildRequires:  kf5-kxmlgui-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtdeclarative-devel
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Obsoletes:      kf5-kactivities-libs < 5.47-2
+Provides:       kf5-kactivities-libs = %{version}-%{release}
+Provides:       kf5-kactivities-libs%{?_isa} = %{version}-%{release}
 
 %description
 A KDE Frameworks 5 Tier 3 API for using and interacting with Activities as a
 consumer, application adding information to them or as an activity manager.
 
-%package libs
-Summary:        Libraries for KActivities framework
-Requires:       kf5-filesystem
-#Requires:       %{name} = %{version}-%{release}
-%description    libs
-%{summary}.
-
 %package devel
-Summary:        Developer files for %{name}-libs
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Summary:        Developer files for %{name}
 Requires:       %{name} = %{version}-%{release}
 Requires:       qt5-qtbase-devel
 %description    devel
@@ -66,22 +60,21 @@ mkdir %{_target_platform}
 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}
 
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc README.md
 %license COPYING*
 %{_kf5_bindir}/kactivities-cli
-
-%files libs
+#files libs
 %{_kf5_libdir}/libKF5Activities.so.*
 %{_kf5_qmldir}/org/kde/activities/
 
@@ -95,6 +88,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup, drop -libs, use %%majmin %%make_build %%ldconfig_scriptlets
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0