From 2e1d484a1d4ce250f6ef410a80cd84be6a7c0459 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 08 2016 10:44:02 +0000
Subject: devel: Conflicts: kapptemplate < 16.03.80


---

diff --git a/kf5-krunner.spec b/kf5-krunner.spec
index 5bb1af4..6496e0c 100644
--- a/kf5-krunner.spec
+++ b/kf5-krunner.spec
@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 solution with parallelized query system
 
 License:        LGPLv2+ and BSD
@@ -37,6 +37,8 @@ KRunner provides a parallelized query system extendable via plugins.
 
 %package        devel
 Summary:        Development files for %{name}
+# krunner template moved here
+Conflicts:      kapptemplate < 16.03.80
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       kf5-plasma-devel >= %{version}
 Requires:       qt5-qtbase-devel
@@ -61,9 +63,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-## unpackaged files
-rm -fv %{buildroot}%{_kf5_datadir}/kdevappwizard/templates/runner*
-
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -81,12 +80,15 @@ rm -fv %{buildroot}%{_kf5_datadir}/kdevappwizard/templates/runner*
 %{_kf5_libdir}/libKF5Runner.so
 %{_kf5_libdir}/cmake/KF5Runner/
 %{_kf5_archdatadir}/mkspecs/modules/qt_KRunner.pri
-#dir %{_kf5_datadir}/kdevappwizard/
-#dir %{_kf5_datadir}/kdevappwizard/templates/
-#{_kf5_datadir}/kdevappwizard/templates/runner*
+%dir %{_kf5_datadir}/kdevappwizard/
+%dir %{_kf5_datadir}/kdevappwizard/templates/
+%{_kf5_datadir}/kdevappwizard/templates/runner*
 
 
 %changelog
+* Fri Apr 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-3
+- -devel: Conflicts: kapptemplate < 16.03.80
+
 * Fri Apr 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-2
 - remove conflict (with kapptemplate): kdevappwizard/template/runner