[kdevelop/f14: 5/5] Merge remote-tracking branch 'origin/f15' into f14

[Rex Dieter]

commit 38cb5111e9bd388dab7dbcc55cf13aa440ac7a88
Merge: 2cb1323 0d96204
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 22 10:11:44 2011 -0500

    Merge remote-tracking branch 'origin/f15' into f14
    
    Conflicts:
    	kdevelop.spec

 kdevelop.spec |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --cc kdevelop.spec
index 5ad0b84,5e8206d..22c0e5a
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@@ -5,7 -5,7 +5,7 @@@ Name:    kdevelo
  Summary: Integrated Development Environment for C++/C
  Epoch:   9
  Version: 4.2.3
--Release: 1%{?dist}
++Release: 3%{?dist}
  
  License: GPLv2
  URL:     http://www.kdevelop.org/
@@@ -20,9 -20,12 +20,12 @@@ BuildRequires: gettex
  BuildRequires: kdebase-workspace-devel
  BuildRequires: kdevplatform-devel >= %{kdevplatform_ver} 
  BuildRequires: kdelibs4-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} > 14
 +%if 0%{?fedora} > 13
  BuildRequires: kdesdk-devel >= 4.5.80
  %else
  BuildRequires: kdeutils-devel
@@@ -72,7 -75,7 +75,12 @@@ Requires: %{name} = %{epoch}:%{version}
  Requires: kdevplatform%{?_isa} >= %{kdevplatform_ver}
  %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
  # okteta libs, http://bugzilla.redhat.com/656847
--%{?_kde4_version:Requires: kdeutils-libs%{?_isa} >= %{kde4_version}}
++# 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}.
  
@@@ -151,9 -154,12 +159,18 @@@ update-mime-database %{_kde4_datadir}/m
  
  
  %changelog
--* Tue Jun 28 2011 Radek Novacek <rnovacek at redhat.com> - 9:4.2.3-1
++* Fri Jul 22 2011 Rex Dieter <rdieter at fedoraproject.org> 9:4.2.3-3
++- fix dep(s) on kdesdk/okteta
++
++* Tue Jun 28 2011 Radek Novacek <rnovacek at redhat.com> - 9:4.2.3-2
++- Rebuild with kdevplatform-1.2.3
++
++* Mon Jun 27 2011 Than Ngo <than at redhat.com> - 9:4.2.3-1
  - 4.2.3
  
+ * Tue Apr 26 2011 Dan Horák <dan[at]danny.cz> - 9:4.2.2-2
+ - valgrind exists only on selected architectures
+ 
  * Thu Apr 07 2011 Radek Novacek <rnovacek at redhat.com> 9:4.2.2-1
  - Update to 4.2.2