diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 556d74e..7ab964b 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -87,6 +87,8 @@ Requires: kf5-filesystem >= %{version} %package devel Summary: Development files for %{name} +# https://bugzilla.redhat.com/1292506 +Conflicts: kapptemplates < 15.12.0-1 Requires: %{name}%{?_isa} = %{version}-%{release} Requires: kf5-kpackage-devel >= %{version} Requires: kf5-kservice-devel >= %{version} @@ -138,7 +140,6 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_mandir}/man1/plasmapkg2.1* -%{_kf5_datadir}/kdevappwizard/templates/*.tar.bz2 %lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/ @@ -150,9 +151,16 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{_kf5_includedir}/plasma_version.h %{_kf5_includedir}/plasma/ %{_kf5_includedir}/Plasma/ +%dir %{_kf5_datadir}/kdevappwizard/ +%{_kf5_datadir}/kdevappwizard/templates/ %changelog +* Thu Dec 17 2015 Rex Dieter - 5.17.0-2 +- Conflicts: kapptemplates < 15.12.0 (#1292506) +- move template to -devel to be on the safe side +- own %%{_kf5_datadir}/kdevappwizard/{,templates/} + * Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 - KDE Frameworks 5.17.0