From 66fccebbf324624f488ed66b90a54161ac0ddb9d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: May 05 2010 20:47:14 +0000
Subject: - Qt documentation not available on Fedora (kde#236315)


---

diff --git a/kdevelop-4.0.0-qmake_qt4.patch b/kdevelop-4.0.0-qmake_qt4.patch
new file mode 100644
index 0000000..84d3330
--- /dev/null
+++ b/kdevelop-4.0.0-qmake_qt4.patch
@@ -0,0 +1,21 @@
+diff -up kdevelop-4.0.0/documentation/qthelp/qthelpplugin.cpp.qmake_qt4 kdevelop-4.0.0/documentation/qthelp/qthelpplugin.cpp
+--- kdevelop-4.0.0/documentation/qthelp/qthelpplugin.cpp.qmake_qt4	2010-04-28 13:33:25.000000000 -0500
++++ kdevelop-4.0.0/documentation/qthelp/qthelpplugin.cpp	2010-05-05 15:45:20.241258971 -0500
+@@ -72,9 +72,14 @@ QtHelpPlugin::QtHelpPlugin(QObject* pare
+     QtHelpDocumentation::s_provider=this;
+     
+     Q_UNUSED(args);
+-	QStringList qmakes;
+-    KStandardDirs::findAllExe(qmakes, "qmake");
+-	QString dirName;
++    QStringList qmakes;
++    QStringList tmp;
++    KStandardDirs::findAllExe(tmp, "qmake-qt4");
++    qmakes += tmp;
++    KStandardDirs::findAllExe(tmp, "qmake");
++    qmakes += tmp;
++    QString dirName;
++
+     foreach(const QString& qmake, qmakes) {
+         /// check both in doc/ and doc/qch/
+         dirName=qtDocsLocation(qmake)+"/qch/";
diff --git a/kdevelop.spec b/kdevelop.spec
index 88af2ce..1e51958 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -6,7 +6,7 @@ Name:    kdevelop
 Summary: Integrated Development Environment for C++/C
 Epoch:   9
 Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kdevelop.org/
@@ -15,6 +15,12 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/%{name}-%{vers
 Source1: ftp://ftp.kde.org/pub/kde/stable/kdevelop/%{version}/src/%{name}-%{version}.tar.bz2.md5sum
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## Upstream patches
+# safer version of
+#http://gitorious.org/kdevelop/kdevelop/commit/72f01b85ac3a5178e2322e5449940e3dda92e3e0
+# fixing https://bugs.kde.org/show_bug.cgi?id=236315
+Patch100: kdevelop-4.0.0-qmake_qt4.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdebase-workspace-devel
@@ -71,6 +77,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 %prep
 %setup -q -n kdevelop-%{version}
 
+%patch100 -p1 -b .qmake_qt4
+
 
 %build
 mkdir -p %{_target_platform}
@@ -142,6 +150,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Wed May 05 2010 Rex Dieter <rdieter@fedoraproject.org> 9:4.0.0-2
+- Qt documentation not available on Fedora  (kde#236315)
+
 * Thu Apr 29 2010 Rex Dieter <rdieter@fedoraproject.org> 9:4.0.0-1
 - kdevelop-4.0.0