diff --git a/kdevelop.spec b/kdevelop.spec index 2a84f7d..fe3c2aa 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -5,7 +5,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 4.90.91 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -70,6 +70,9 @@ BuildRequires: valgrind-devel Provides: kdevelop-custom-buildsystem = 9:%{version}-%{release} Obsoletes: kdevelop-custom-buildsystem < 1.2.1-5 +# kdevappwizard/templates/qmake_qt4guiapp moved here +Conflicts: kapptemplate < 16.03.80 + Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: git Requires: cmake @@ -119,7 +122,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %setup -q -n kdevelop-%{version} %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. popd @@ -157,7 +160,8 @@ update-desktop-database -q &> /dev/null update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang -%doc AUTHORS COPYING COPYING.DOC COPYING.LIB +%doc AUTHORS +%license COPYING COPYING.DOC COPYING.LIB %{_bindir}/kdevelop %{_bindir}/kdevelop! %{_bindir}/kdev_includepathsconverter @@ -190,6 +194,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Apr 08 2016 Rex Dieter - 9:4.90.91-5 +- Conflicts: kapptemplate < 16.03.80 +- .spec cosmetics, use %%license + * Fri Mar 04 2016 Daniel Vrátil - 9:4.90.91-4 - Rebuld against new clang