rpms/soprano/F-13 soprano-2.4.3-missing-qdebug-header.patch, NONE, 1.1 soprano.spec, 1.55, 1.56 soprano-2.4.1-missing-qdebug-header.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	soprano.spec 
Added Files:
	soprano-2.4.3-missing-qdebug-header.patch 
Removed Files:
	soprano-2.4.1-missing-qdebug-header.patch 
Log Message:
sync w/devel, fix build


soprano-2.4.3-missing-qdebug-header.patch:
 client/localsocketclient.cpp |    1 +
 server/localserver.cpp       |    1 +
 server/tcpserver.cpp         |    1 +
 3 files changed, 3 insertions(+)

--- NEW FILE soprano-2.4.3-missing-qdebug-header.patch ---
diff -up soprano-2.4.3/client/localsocketclient.cpp.missing-qdebug-header soprano-2.4.3/client/localsocketclient.cpp
--- soprano-2.4.3/client/localsocketclient.cpp.missing-qdebug-header	2010-04-22 04:35:08.000000000 -0500
+++ soprano-2.4.3/client/localsocketclient.cpp	2010-04-22 08:15:27.604825134 -0500
@@ -23,6 +23,7 @@
 #include "clientconnection.h"
 #include "clientmodel.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QThread>
 #include <QtNetwork/QLocalSocket>
diff -up soprano-2.4.3/server/localserver.cpp.missing-qdebug-header soprano-2.4.3/server/localserver.cpp
--- soprano-2.4.3/server/localserver.cpp.missing-qdebug-header	2010-04-12 07:14:57.000000000 -0500
+++ soprano-2.4.3/server/localserver.cpp	2010-04-22 08:23:15.025563785 -0500
@@ -23,6 +23,7 @@
 #include "serverconnection.h"
 #include "servercore_p.h"
 
+#include <QtCore/QDebug>
 #include <QtNetwork/QLocalSocket>
 
 namespace {
diff -up soprano-2.4.3/server/tcpserver.cpp.missing-qdebug-header soprano-2.4.3/server/tcpserver.cpp
--- soprano-2.4.3/server/tcpserver.cpp.missing-qdebug-header	2010-04-12 07:14:57.000000000 -0500
+++ soprano-2.4.3/server/tcpserver.cpp	2010-04-22 08:25:26.484562301 -0500
@@ -23,6 +23,7 @@
 #include "serverconnection.h"
 #include "servercore_p.h"
 
+#include <QtCore/QDebug>
 #include <QtNetwork/QTcpSocket>
 
 namespace {


Index: soprano.spec
===================================================================
RCS file: /cvs/pkgs/rpms/soprano/F-13/soprano.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- soprano.spec	22 Apr 2010 13:03:29 -0000	1.55
+++ soprano.spec	22 Apr 2010 13:29:34 -0000	1.56
@@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 ## upstreamable patches
 # fix missing #include which breaks QT_NO_DEBUG_OUTPUT build
-Patch50:  soprano-2.4.1-missing-qdebug-header.patch
+Patch50:  soprano-2.4.3-missing-qdebug-header.patch
 
 BuildRequires: clucene-core-devel >= 0.9.20-2
 BuildRequires: cmake
@@ -109,7 +109,7 @@ export CXXFLAGS="%optflags -DQT_NO_DEBUG
 %endif
 %{cmake} \
   -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \
-  -DQT_DOC_DIR=`pkg-config --variable=docdir Qt` \
+  -DQT_DOC_DIR=%{?_qt4_docdir}%{!?_qt4_docdir:%(pkg-config --variable=docdir Qt)} \
   -DSOPRANO_BUILD_API_DOCS:BOOL=%{!?apidocs:0}%{?apidocs} \
   -DSOPRANO_BUILD_TESTS:BOOL=%{!?tests:FALSE}%{?tests} \
   %{?_cmake_skip_rpath} \


--- soprano-2.4.1-missing-qdebug-header.patch DELETED ---