From 4b2a95716c779283f3e3a19ee8e26f7e5e12bae0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 7 Jun 2018 16:48:14 -0500
Subject: [PATCH] cleanup, use %majmin

---
 .gitignore            | 26 --------------------------
 kf5-kdeclarative.spec | 37 +++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4641586..770e76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1 @@
-/kdeclarative-5.19.0.tar.xz
-/kdeclarative-5.20.0.tar.xz
-/kdeclarative-5.21.0.tar.xz
-/kdeclarative-5.22.0.tar.xz
-/kdeclarative-5.23.0.tar.xz
-/kdeclarative-5.24.0.tar.xz
-/kdeclarative-5.25.0.tar.xz
-/kdeclarative-5.26.0.tar.xz
-/kdeclarative-5.27.0.tar.xz
-/kdeclarative-5.29.0.tar.xz
-/kdeclarative-5.31.0.tar.xz
-/kdeclarative-5.32.0.tar.xz
-/kdeclarative-5.33.0.tar.xz
-/kdeclarative-5.34.0.tar.xz
-/kdeclarative-5.35.0.tar.xz
-/kdeclarative-5.36.0.tar.xz
-/kdeclarative-5.37.0.tar.xz
-/kdeclarative-5.38.0.tar.xz
-/kdeclarative-5.39.0.tar.xz
-/kdeclarative-5.40.0.tar.xz
-/kdeclarative-5.41.0.tar.xz
-/kdeclarative-5.42.0.tar.xz
-/kdeclarative-5.43.0.tar.xz
-/kdeclarative-5.44.0.tar.xz
-/kdeclarative-5.45.0.tar.xz
-/kdeclarative-5.46.0.tar.xz
 /kdeclarative-5.47.0.tar.xz
diff --git a/kf5-kdeclarative.spec b/kf5-kdeclarative.spec
index 3d48e98..efed5a1 100644
--- a/kf5-kdeclarative.spec
+++ b/kf5-kdeclarative.spec
@@ -9,37 +9,37 @@
 
 Name:    kf5-%{framework}
 Version: 5.47.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 3 addon for Qt declarative
 
 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
 
 # filter qml provides
 %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$
 
 ## upstream patches
 
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kconfig-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-kpackage-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-BuildRequires:  kf5-kwindowsystem-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-kconfig-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-kpackage-devel >= %{majmin}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
+BuildRequires:  kf5-kwindowsystem-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
 BuildRequires:  libepoxy-devel
 BuildRequires:  qt5-qtbase-devel
 # https://bugs.kde.org/show_bug.cgi?id=365569#c8 claims this may be needed,
@@ -54,16 +54,14 @@ BuildRequires: time
 BuildRequires: xorg-x11-server-Xvfb
 %endif
 
-Requires:       kf5-filesystem >= %{version}
-
 %description
 KDE Frameworks 5 Tier 3 addon for Qt declarative
 
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       kf5-kconfig-devel >= %{version}
-Requires:       kf5-kpackage-devel >= %{version}
+Requires:       kf5-kconfig-devel >= %{majmin}
+Requires:       kf5-kpackage-devel >= %{majmin}
 Requires:       qt5-qtdeclarative-devel
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -134,6 +132,9 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor
 
 
 %changelog
+* Thu Jun 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-2
+- cleanup, use %%majmin
+
 * Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.47.0-1
 - 5.47.0