From c9014ad258120ec23edf6bebce759f6a6f50a9e9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 7 Dec 2017 07:49:04 -0600
Subject: [PATCH] .spec cleanup

---
 .gitignore          | 21 ---------------------
 kf5-kbookmarks.spec | 34 ++++++++++++++++++----------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index f9f593b..6cd3799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1 @@
-/kbookmarks-5.18.0.tar.xz
-/kbookmarks-5.19.0.tar.xz
-/kbookmarks-5.20.0.tar.xz
-/kbookmarks-5.21.0.tar.xz
-/kbookmarks-5.22.0.tar.xz
-/kbookmarks-5.23.0.tar.xz
-/kbookmarks-5.24.0.tar.xz
-/kbookmarks-5.25.0.tar.xz
-/kbookmarks-5.26.0.tar.xz
-/kbookmarks-5.27.0.tar.xz
-/kbookmarks-5.29.0.tar.xz
-/kbookmarks-5.31.0.tar.xz
-/kbookmarks-5.32.0.tar.xz
-/kbookmarks-5.33.0.tar.xz
-/kbookmarks-5.34.0.tar.xz
-/kbookmarks-5.35.0.tar.xz
-/kbookmarks-5.36.0.tar.xz
-/kbookmarks-5.37.0.tar.xz
-/kbookmarks-5.38.0.tar.xz
-/kbookmarks-5.39.0.tar.xz
-/kbookmarks-5.40.0.tar.xz
 /kbookmarks-5.41.0.tar.xz
diff --git a/kf5-kbookmarks.spec b/kf5-kbookmarks.spec
index 77d9f7d..1c0caa9 100644
--- a/kf5-kbookmarks.spec
+++ b/kf5-kbookmarks.spec
@@ -2,35 +2,34 @@
 
 Name:           kf5-%{framework}
 Version: 5.41.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 addon for bookmarks manipulation
 
 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
-
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-kcodecs-devel >= %{version}
-BuildRequires:  kf5-kconfig-devel >= %{version}
-BuildRequires:  kf5-kconfigwidgets-devel >= %{version}
-BuildRequires:  kf5-kcoreaddons-devel >= %{version}
-BuildRequires:  kf5-kiconthemes-devel >= %{version}
-BuildRequires:  kf5-kwidgetsaddons-devel >= %{version}
-BuildRequires:  kf5-kxmlgui-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
+Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
+
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-rpm-macros
+BuildRequires:  kf5-kcodecs-devel >= %{majmin}
+BuildRequires:  kf5-kconfig-devel >= %{majmin}
+BuildRequires:  kf5-kconfigwidgets-devel >= %{majmin}
+BuildRequires:  kf5-kcoreaddons-devel >= %{majmin}
+BuildRequires:  kf5-kiconthemes-devel >= %{majmin}
+BuildRequires:  kf5-kwidgetsaddons-devel >= %{majmin}
+BuildRequires:  kf5-kxmlgui-devel >= %{majmin}
+
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qttools-devel
 
-Requires:       kf5-filesystem >= %{version}
-
 %description
 KBookmarks lets you access and manipulate bookmarks stored using the
 XBEL format.
@@ -61,7 +60,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang kbookmarks5_qt --with-qt --all-name
+%find_lang_kf5 kbookmarks5_qt
 
 
 %post -p /sbin/ldconfig
@@ -81,6 +80,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Thu Dec 07 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.41.0-2
+- .spec cleanup
+
 * Mon Dec 04 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.41.0-1
 - 5.41.0