From c0d3838e55dd12709404cbdf7c7352d3816f9a0f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Apr 20 2018 23:07:02 +0000
Subject: fix build, cleanup


---

diff --git a/.gitignore b/.gitignore
index 78679b1..3a9f87c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1 @@
-/ktimer-17.04.1.tar.xz
-/ktimer-17.04.2.tar.xz
-/ktimer-17.04.3.tar.xz
-/ktimer-17.08.1.tar.xz
-/ktimer-17.08.3.tar.xz
-/ktimer-17.12.0.tar.xz
-/ktimer-17.12.1.tar.xz
-/ktimer-17.12.2.tar.xz
-/ktimer-17.12.3.tar.xz
 /ktimer-18.04.0.tar.xz
diff --git a/ktimer.spec b/ktimer.spec
index edfe725..f44d52b 100644
--- a/ktimer.spec
+++ b/ktimer.spec
@@ -16,6 +16,8 @@ URL:     https://cgit.kde.org/%{name}.git
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 BuildRequires: desktop-file-utils
+BuildRequires: libappstream-glib
+
 BuildRequires: extra-cmake-modules
 BuildRequires: gettext
 BuildRequires: kf5-rpm-macros
@@ -42,7 +44,6 @@ BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: kf5-kwidgetsaddons-devel
 BuildRequires: kf5-kxmlgui-devel
 BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5DBus)
-#BuildRequires: libappstream-glib
 
 # translations moved here
 Conflicts: kde-l10n < 17.03
@@ -67,7 +68,7 @@ pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+%make_build -C %{_target_platform}
 
 
 %install
@@ -77,8 +78,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %check
-#appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop
 
 
 %files -f %{name}.lang
@@ -87,7 +88,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d
 %{_kf5_bindir}/%{name}
 #{_sysconfdir}/xdg/%{name}.knsrc
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
-#{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml
+%{_kf5_metainfodir/org.kde.%{name}.appdata.xml
 %{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
 #{_kf5_datadir}/%{name}/
 #{_kf5_datadir}/kconf_update/%{name}*