From 9cb1b3ba77ead4e6c1558241c50de1b2e3789033 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Apr 2016 00:07:04 -0500 Subject: [PATCH] remove conflict (with kapptemplate): kdevappwizard/template/runner --- kf5-krunner.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/kf5-krunner.spec b/kf5-krunner.spec index 53c8255..5bb1af4 100644 --- a/kf5-krunner.spec +++ b/kf5-krunner.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 solution with parallelized query system License: LGPLv2+ and BSD @@ -61,6 +61,9 @@ 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 @@ -78,12 +81,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{_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 - 5.21.0-2 +- remove conflict (with kapptemplate): kdevappwizard/template/runner + * Mon Apr 04 2016 Rex Dieter - 5.21.0-1 - KDE Frameworks 5.21.0