From d03dea91dc91d90a1d0e24d73e6caf0bc791b61a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 22 2010 13:29:34 +0000
Subject: sync w/devel, fix build


---

diff --git a/soprano-2.4.1-missing-qdebug-header.patch b/soprano-2.4.1-missing-qdebug-header.patch
deleted file mode 100644
index c79f39f..0000000
--- a/soprano-2.4.1-missing-qdebug-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur soprano-2.4.1/client/localsocketclient.cpp soprano-2.4.1-missing-qdebug-header/client/localsocketclient.cpp
---- soprano-2.4.1/client/localsocketclient.cpp	2010-01-19 16:19:53.000000000 +0100
-+++ soprano-2.4.1-missing-qdebug-header/client/localsocketclient.cpp	2010-03-23 21:30:53.000000000 +0100
-@@ -23,6 +23,7 @@
- #include "clientconnection.h"
- #include "clientmodel.h"
- 
-+#include <QtCore/QDebug>
- #include <QtCore/QDir>
- #include <QtCore/QThread>
- #include <QtNetwork/QLocalSocket>
diff --git a/soprano-2.4.3-missing-qdebug-header.patch b/soprano-2.4.3-missing-qdebug-header.patch
new file mode 100644
index 0000000..a200379
--- /dev/null
+++ b/soprano-2.4.3-missing-qdebug-header.patch
@@ -0,0 +1,33 @@
+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 {
diff --git a/soprano.spec b/soprano.spec
index e5d97df..6f89841 100644
--- a/soprano.spec
+++ b/soprano.spec
@@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## 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_OUTPUT"
 %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} \