[libqzeitgeist] declarative patch

[Rex Dieter]

commit b9d18196a269c80e9b334d5e9bc9436e7d359361
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 31 07:42:58 2011 -0500

    declarative patch

 libqzeitgeist-0.8.0-declarative.patch |   17 +++++++++++++++++
 libqzeitgeist.spec                    |   13 +++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/libqzeitgeist-0.8.0-declarative.patch b/libqzeitgeist-0.8.0-declarative.patch
new file mode 100644
index 0000000..5afd3c3
--- /dev/null
+++ b/libqzeitgeist-0.8.0-declarative.patch
@@ -0,0 +1,17 @@
+
+fix linking, don't link the Qt world via QT_LIBRARIES (including QtWebkit), only use QT_DECLARATIVE_LIBRARIES
+consistently use QT_IMPORTS_DIR
+
+diff -up libqzeitgeist-0.8.0/declarative/CMakeLists.txt.declarative libqzeitgeist-0.8.0/declarative/CMakeLists.txt
+--- libqzeitgeist-0.8.0/declarative/CMakeLists.txt.declarative	2011-10-27 09:08:58.000000000 -0500
++++ libqzeitgeist-0.8.0/declarative/CMakeLists.txt	2011-10-31 07:36:01.751921806 -0500
+@@ -14,7 +14,7 @@ include_directories(${CMAKE_CURRENT_SOUR
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/)
+ automoc4_add_library(QZeitgeistDeclarativePlugin MODULE ${declarative_SRCS})
+ 
+-target_link_libraries(QZeitgeistDeclarativePlugin ${QT_LIBRARIES} qzeitgeist)
++target_link_libraries(QZeitgeistDeclarativePlugin ${QT_DECLARATIVE_LIBRARIES} qzeitgeist)
+ 
+-install(TARGETS QZeitgeistDeclarativePlugin DESTINATION lib${LIB_SUFFIX}/qt4/imports/org/gnome/zeitgeist)
++install(TARGETS QZeitgeistDeclarativePlugin DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist)
+ install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist)
diff --git a/libqzeitgeist.spec b/libqzeitgeist.spec
index 2a3a21c..b7ed08b 100644
--- a/libqzeitgeist.spec
+++ b/libqzeitgeist.spec
@@ -2,16 +2,20 @@
 Name:    libqzeitgeist
 Summary: Qt Zeitgeist Library
 Version: 0.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 URL:     http://projects.kde.org/projects/kdesupport/libqzeitgeist 
 Source0: http://download.kde.org/download.php?url=stable/libqzeitgeist/%{version}/src/libqzeitgeist-%{version}.tar.bz2
 
+## upstreamable patches
+# fix linking (don't link the Qt world, including QtWebkit, only use QT_DECLARATIVE_LIBRARIES)
+# consistently use QT_IMPORTS_DIR
+Patch50: libqzeitgeist-0.8.0-declarative.patch
+
 BuildRequires: automoc4
 BuildRequires: cmake
 BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDeclarative) pkgconfig(QtXml)
-BuildRequires: pkgconfig(QtWebKit)
 BuildRequires: zeitgeist
 
 %description
@@ -27,6 +31,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q 
 
+%patch50 -p1 -b .declarative
+
 
 %build
 mkdir -p %{_target_platform}
@@ -65,6 +71,9 @@ test "$(pkg-config --modversion QZeitgeist)" = "%{version}"
 
 
 %changelog
+* Mon Oct 31 2011 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-2
+- declarative patch
+
 * Thu Oct 27 2011 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-1
 - 0.8.0