cleanup, use %majmin %make_build

.gitignore

@@ -1,13 +1 @@
-/plasma-framework-5.35.0.tar.xz
-/plasma-framework-5.36.0.tar.xz
-/plasma-framework-5.37.0.tar.xz
-/plasma-framework-5.38.0.tar.xz
-/plasma-framework-5.39.0.tar.xz
-/plasma-framework-5.40.0.tar.xz
-/plasma-framework-5.41.0.tar.xz
-/plasma-framework-5.42.0.tar.xz
-/plasma-framework-5.43.0.tar.xz
-/plasma-framework-5.44.0.tar.xz
-/plasma-framework-5.45.0.tar.xz
-/plasma-framework-5.46.0.tar.xz
 /plasma-framework-5.47.0.tar.xz

kf5-plasma.spec

@@ -2,20 +2,20 @@
 
 Name:    kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface
 
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     https://cgit.kde.org/plasma-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}-framework-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-framework-%{version}.tar.xz
 
 # hackish cache invalidation
 # upstream has worked on this issue recently (.31 or .32?) so may consider dropping this -- rex
@@ -26,35 +26,35 @@ Source10: fedora-plasma-cache.sh.in
 # filter qml provides
 %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$
 
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kactivities-devel >= %{version}
-BuildRequires:  kf5-kactivities-devel >= %{version}
-BuildRequires:  kf5-karchive-devel >= %{version}
-BuildRequires:  kf5-kconfig-devel >= %{version}
-BuildRequires:  kf5-kconfigwidgets-devel >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-kdbusaddons-devel >= %{version}
-BuildRequires:  kf5-kdeclarative-devel >= %{version}
-BuildRequires:  kf5-kdesu-devel >= %{version}
-BuildRequires:  kf5-kdoctools-devel >= %{version}
-BuildRequires:  kf5-kglobalaccel-devel >= %{version}
-BuildRequires:  kf5-kguiaddons-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
-BuildRequires:  kf5-kiconthemes-devel >= %{version}
-BuildRequires:  kf5-kio-devel >= %{version}
-BuildRequires:  kf5-knotifications-devel >= %{version}
-BuildRequires:  kf5-kpackage-devel >= %{version}
-BuildRequires:  kf5-kparts-devel >= %{version}
-BuildRequires:  kf5-kservice-devel >= %{version}
-BuildRequires:  kf5-kirigami2-devel >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-kactivities-devel >= %{majmin}
+BuildRequires:  kf5-kactivities-devel >= %{majmin}
+BuildRequires:  kf5-karchive-devel >= %{majmin}
+BuildRequires:  kf5-kconfig-devel >= %{majmin}
+BuildRequires:  kf5-kconfigwidgets-devel >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-kdbusaddons-devel >= %{majmin}
+BuildRequires:  kf5-kdeclarative-devel >= %{majmin}
+BuildRequires:  kf5-kdesu-devel >= %{majmin}
+BuildRequires:  kf5-kdoctools-devel >= %{majmin}
+BuildRequires:  kf5-kglobalaccel-devel >= %{majmin}
+BuildRequires:  kf5-kguiaddons-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-kiconthemes-devel >= %{majmin}
+BuildRequires:  kf5-kio-devel >= %{majmin}
+BuildRequires:  kf5-knotifications-devel >= %{majmin}
+BuildRequires:  kf5-kpackage-devel >= %{majmin}
+BuildRequires:  kf5-kparts-devel >= %{majmin}
+BuildRequires:  kf5-kservice-devel >= %{majmin}
+BuildRequires:  kf5-kirigami2-devel >= %{majmin}
 %if 0%{?fedora}
-BuildRequires:  kf5-kwayland-devel >= %{version}
+BuildRequires:  kf5-kwayland-devel >= %{majmin}
 %endif
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-BuildRequires:  kf5-kwindowsystem-devel >= %{version}
-BuildRequires:  kf5-kxmlgui-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
-BuildRequires:  kf5-solid-devel >= %{version}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
+BuildRequires:  kf5-kwindowsystem-devel >= %{majmin}
+BuildRequires:  kf5-kxmlgui-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  kf5-solid-devel >= %{majmin}
 BuildRequires:  libGL-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
@@ -87,9 +87,9 @@ Summary:        Development files for %{name}
 # https://bugzilla.redhat.com/1292506
 Conflicts:      kapptemplates < 15.12.0-1
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       kf5-kpackage-devel >= %{version}
-Requires:       kf5-kservice-devel >= %{version}
-Requires:       kf5-kwindowsystem-devel >= %{version}
+Requires:       kf5-kpackage-devel >= %{majmin}
+Requires:       kf5-kservice-devel >= %{majmin}
+Requires:       kf5-kwindowsystem-devel >= %{majmin}
 Requires:       qt5-qtbase-devel
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -108,7 +108,7 @@ pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
@@ -127,7 +127,7 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \
 %endif
 
 
-%{?ldconfig_scriptlets}
+%ldconfig_scriptlets
 
 %files -f %{name}.lang
 %doc README.md
@@ -170,6 +170,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \
 
 
 %changelog
+* Fri Jun 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup, use %%majmin %%make_build
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0