From 7ba9c920c09088682beb15ff4a15088080b20aee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sep 07 2016 12:40:19 +0000 Subject: +macros.kdevelop: make addon packages easier to manage --- diff --git a/kdevelop.spec b/kdevelop.spec index 6221d19..8e40c60 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -4,11 +4,14 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{src_ver}.tar.xz +%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) +Source10: kdevelop.macros + # upstreamable patches # upstream patches @@ -49,7 +52,6 @@ BuildRequires: kf5-kcrash-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel -BuildRequires: qt5-qtquick1-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qttools-devel @@ -106,7 +108,7 @@ Summary: %{name} runtime libraries # helps multilib upgrades Obsoletes: kdevelop < 9:3.9.95 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} +#Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %description libs %{summary}. @@ -114,6 +116,7 @@ Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver} %prep %setup -q -n kdevelop-%{src_ver} + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -126,7 +129,19 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang %{name} --all-name --with-kde +%find_lang %{name} --all-name + + +# rpm macros +install -p -m644 -D %{SOURCE10} \ + %{buildroot}%{rpm_macros_dir}/macros.kdevelop +sed -i \ + -e "s|@@NAME@@|%{name}|g" \ + -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ + -e "s|@@VERSION@@|%{version}|g" \ + -e "s|@@EVR@@|%{?epoch:%{epoch}:}%{version}-%{release}|g" \ + %{buildroot}%{rpm_macros_dir}/macros.kdevelop + %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desktop @@ -181,9 +196,16 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files devel %{_libdir}/cmake/KDevelop/*.cmake %{_includedir}/kdevelop/ +%{rpm_macros_dir}/macros.kdevelop %changelog +* Wed Sep 07 2016 Rex Dieter - 5.0.0-2 +- +macros.kdevelop: make addon packages easier to manage + +* Wed Aug 24 2016 Helio Chissini de Castro - 5.0.0-1 +- New upstream version + * Mon Aug 08 2016 Jan Grulich - 5.0.0-0.3.20160808git - Update to latest git snapshot diff --git a/macros.kdevelop b/macros.kdevelop new file mode 100644 index 0000000..6940d85 --- /dev/null +++ b/macros.kdevelop @@ -0,0 +1,9 @@ +%kdevelop @@NAME@@ +%kdevelop_epoch @@EPOCH@@ +%kdevelop_version @@VERSION@@ +%kdevelop_evr @@EVR@@ + +%kdevelop_requires \ +Requires: %{kdevelop} >= %{kdevelop_evr} \ +%{nil} +