[kdevelop/epel7: 5/5] Merge branch 'master' into epel7

[Jan Grulich]

commit 7c1ef115e4d43a06167a312ae88cc8c3d6085011
Merge: a22cf71 59e7de8
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Wed Feb 25 15:24:40 2015 +0100

    Merge branch 'master' into epel7

 .gitignore    |  1 +
 kdevelop.spec | 15 +++++++++++----
 sources       |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --cc kdevelop.spec
index 28a2bbd,71676b5..c63aef8
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@@ -4,11 -4,9 +4,11 @@@
  Name:    kdevelop
  Summary: Integrated Development Environment for C++/C
  Epoch:   9
- Version: 4.7.0
+ Version: 4.7.1
  Release: 1%{?dist}
  
 +ExcludeArch: ppc64
 +
  License: GPLv2
  URL:     http://www.kdevelop.org/
  Source0: http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-%{version}.tar.xz
@@@ -23,10 -21,11 +23,11 @@@ Patch0:  kdevelop-4.5.0-no-rpath.patc
  BuildRequires: boost-devel
  BuildRequires: desktop-file-utils
  BuildRequires: gettext
- BuildRequires: kdebase-workspace-devel
+ # Enable when kde-workspace parts are available in rawhide
+ # BuildRequires: kdebase-workspace-devel
  BuildRequires: kdevplatform-devel >= %{kdevplatform_ver}
  BuildRequires: kdelibs4-devel
 -BuildRequires: okteta-devel
 +BuildRequires: kdesdk-okteta-devel
  BuildRequires: qjson-devel
  BuildRequires: qtwebkit-devel
  # some arches don't have valgrind so we need to disable its support on them