[kdevelop] drop < f14 conditionals BR: okteta-devel
Rex Dieter
rdieter at fedoraproject.org
Sun Jul 31 17:04:52 UTC 2011
commit 820b15724273d0218f7c6e3410ab40a5901eaff6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jul 31 12:10:23 2011 -0500
drop < f14 conditionals
BR: okteta-devel
kdevelop.spec | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/kdevelop.spec b/kdevelop.spec
index 22c0e5a..49f475c 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -5,7 +5,7 @@ Name: kdevelop
Summary: Integrated Development Environment for C++/C
Epoch: 9
Version: 4.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
URL: http://www.kdevelop.org/
@@ -20,16 +20,11 @@ BuildRequires: gettext
BuildRequires: kdebase-workspace-devel
BuildRequires: kdevplatform-devel >= %{kdevplatform_ver}
BuildRequires: kdelibs4-devel
+BuildRequires: okteta-devel
# some arches don't have valgrind so we need to disable its support on them
%ifarch %{ix86} x86_64 ppc ppc64 s390x
BuildRequires: valgrind-devel
%endif
-# okteta moved -> kdesdk-4.5.80
-%if 0%{?fedora} > 13
-BuildRequires: kdesdk-devel >= 4.5.80
-%else
-BuildRequires: kdeutils-devel
-%endif
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: git
@@ -74,13 +69,7 @@ Obsoletes: kdevelop < 9:3.9.95
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
-# okteta libs, http://bugzilla.redhat.com/656847
-# okteta moved -> kdesdk-4.5.80
-%if 0%{?fedora} > 13
%{?_kde4_version:Requires: okteta >= %{_kde4_version}}
-%else
-%{?_kde4_version:Requires: kdeutils-libs%{?_isa} >= %{_kde4_version}}
-%endif
%description libs
%{summary}.
@@ -159,6 +148,10 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
%changelog
+* Sun Jul 31 2011 Rex Dieter <rdieter at fedoraproject.org> 9:4.2.3-4
+- drop < f14 conditionals
+- BR: okteta-devel
+
* Fri Jul 22 2011 Rex Dieter <rdieter at fedoraproject.org> 9:4.2.3-3
- fix dep(s) on kdesdk/okteta
More information about the scm-commits
mailing list