From 6e39d3ee22636b95d66b3e3bf1a14183307b507c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 7 Dec 2017 08:20:26 -0600
Subject: [PATCH] cleanup

---
 .gitignore             | 34 ----------------------------------
 kf5-kfilemetadata.spec | 33 +++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index f1e51da..5722117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1 @@
-/kfilemetadata-5.5.95.tar.xz
-/kfilemetadata-5.6.0.tar.xz
-/kfilemetadata-5.6.1.tar.xz
-/kfilemetadata-5.6.2.tar.xz
-/kfilemetadata-5.6.95.tar.xz
-/kfilemetadata-5.9.0.tar.xz
-/kfilemetadata-5.9.1.tar.xz
-/kfilemetadata-5.9.2.tar.xz
-/kfilemetadata-5.13.0.tar.xz
-/kfilemetadata-5.14.0.tar.xz
-/kfilemetadata-5.15.0.tar.xz
-/kfilemetadata-5.16.0.tar.xz
-/kfilemetadata-5.17.0.tar.xz
-/kfilemetadata-5.18.0.tar.xz
-/kfilemetadata-5.19.0.tar.xz
-/kfilemetadata-5.20.0.tar.xz
-/kfilemetadata-5.21.0.tar.xz
-/kfilemetadata-5.22.0.tar.xz
-/kfilemetadata-5.23.0.tar.xz
-/kfilemetadata-5.24.0.tar.xz
-/kfilemetadata-5.25.0.tar.xz
-/kfilemetadata-5.26.0.tar.xz
-/kfilemetadata-5.27.0.tar.xz
-/kfilemetadata-5.29.0.tar.xz
-/kfilemetadata-5.31.0.tar.xz
-/kfilemetadata-5.32.0.tar.xz
-/kfilemetadata-5.33.0.tar.xz
-/kfilemetadata-5.34.0.tar.xz
-/kfilemetadata-5.35.0.tar.xz
-/kfilemetadata-5.36.0.tar.xz
-/kfilemetadata-5.37.0.tar.xz
-/kfilemetadata-5.38.0.tar.xz
-/kfilemetadata-5.39.0.tar.xz
-/kfilemetadata-5.40.0.tar.xz
 /kfilemetadata-5.41.0.tar.xz
diff --git a/kf5-kfilemetadata.spec b/kf5-kfilemetadata.spec
index 38f8ab8..3c7fef4 100644
--- a/kf5-kfilemetadata.spec
+++ b/kf5-kfilemetadata.spec
@@ -18,37 +18,41 @@ Release: 1%{?dist}
 License:        LGPLv2 or LGPLv3
 URL:            https://cgit.kde.org/%{framework}
 
-%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 plugin provides
 %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
 
+BuildRequires:  extra-cmake-modules >= %{majmin}
+BuildRequires:  kf5-karchive-devel >= %{majmin}
+BuildRequires:  kf5-ki18n-devel >= %{majmin}
+BuildRequires:  kf5-rpm-macros
+
+BuildRequires:  qt5-qtbase-devel
+
+BuildRequires:  libattr-devel
+BuildRequires:  pkgconfig(exiv2) >= 0.20
+
+## optional deps
 %if 0%{?ebook}
 BuildRequires:  ebook-tools-devel
 %endif
-BuildRequires:  extra-cmake-modules >= %{version}
-BuildRequires:  kf5-karchive-devel >= %{version}
-BuildRequires:  kf5-ki18n-devel >= %{version}
-BuildRequires:  kf5-rpm-macros >= %{version}
-BuildRequires:  libattr-devel
-BuildRequires:  pkgconfig(exiv2) >= 0.20
+%if 0%{?ffmpeg}
+BuildRequires:  ffmpeg-devel
+%endif
 %if 0%{?poppler}
 BuildRequires:  pkgconfig(poppler-qt5)
 %endif
 %if 0%{?taglib}
 BuildRequires:  pkgconfig(taglib) >= 1.9
 %endif
-BuildRequires:  qt5-qtbase-devel
-%if 0%{?ffmpeg}
-BuildRequires:  ffmpeg-devel
-%endif
 
 %description
 %{summary}.
@@ -76,7 +80,8 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kfilemetadata5_qt --with-qt --all-name
+
+%find_lang %{name} --all-name
 
 mkdir -p %{buildroot}%{_kf5_plugindir}/kfilemetadata/writers/
 
@@ -84,7 +89,7 @@ mkdir -p %{buildroot}%{_kf5_plugindir}/kfilemetadata/writers/
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f kfilemetadata5_qt.lang
+%files -f %{name}.lang
 %license COPYING.LGPL*
 %{_sysconfdir}/xdg/%{framework}*
 %{_kf5_libdir}/libKF5FileMetaData.so.*