rpms/kdevelop/F-13 kdevelop-4.0.0-qmake_qt4.patch, NONE, 1.1 kdevelop.spec, 1.102, 1.103

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdevelop/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7577

Modified Files:
	kdevelop.spec 
Added Files:
	kdevelop-4.0.0-qmake_qt4.patch 
Log Message:
* Wed May 05 2010 Rex Dieter <rdieter at fedoraproject.org> 9:4.0.0-2
- Qt documentation not available on Fedora  (kde#236315)


kdevelop-4.0.0-qmake_qt4.patch:
 qthelpplugin.cpp |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

--- NEW FILE kdevelop-4.0.0-qmake_qt4.patch ---
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/";


Index: kdevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdevelop/F-13/kdevelop.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- kdevelop.spec	29 Apr 2010 14:03:16 -0000	1.102
+++ kdevelop.spec	5 May 2010 20:48:07 -0000	1.103
@@ -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/stabl
 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}-
 %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}/mi
 
 
 %changelog
+* Wed May 05 2010 Rex Dieter <rdieter at fedoraproject.org> 9:4.0.0-2
+- Qt documentation not available on Fedora  (kde#236315)
+
 * Thu Apr 29 2010 Rex Dieter <rdieter at fedoraproject.org> 9:4.0.0-1
 - kdevelop-4.0.0