[libqzeitgeist] reduced linking for libqzeitgeist too

[Rex Dieter]

commit b53707a02a3f77a64e21fcb310342797d86bf759
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 31 08:18:45 2011 -0500

    reduced linking for libqzeitgeist too

 libqzeitgeist-0.8.0-declarative.patch     |    2 +-
 libqzeitgeist-0.8.0-reduced_linking.patch |   12 ++++++++++++
 libqzeitgeist.spec                        |   10 +++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/libqzeitgeist-0.8.0-declarative.patch b/libqzeitgeist-0.8.0-declarative.patch
index 5afd3c3..f4400f0 100644
--- a/libqzeitgeist-0.8.0-declarative.patch
+++ b/libqzeitgeist-0.8.0-declarative.patch
@@ -10,7 +10,7 @@ diff -up libqzeitgeist-0.8.0/declarative/CMakeLists.txt.declarative libqzeitgeis
  automoc4_add_library(QZeitgeistDeclarativePlugin MODULE ${declarative_SRCS})
  
 -target_link_libraries(QZeitgeistDeclarativePlugin ${QT_LIBRARIES} qzeitgeist)
-+target_link_libraries(QZeitgeistDeclarativePlugin ${QT_DECLARATIVE_LIBRARIES} qzeitgeist)
++target_link_libraries(QZeitgeistDeclarativePlugin ${QT_QTDECLARATIVE_LIBRARIES} qzeitgeist)
  
 -install(TARGETS QZeitgeistDeclarativePlugin DESTINATION lib${LIB_SUFFIX}/qt4/imports/org/gnome/zeitgeist)
 +install(TARGETS QZeitgeistDeclarativePlugin DESTINATION ${QT_IMPORTS_DIR}/org/gnome/zeitgeist)
diff --git a/libqzeitgeist-0.8.0-reduced_linking.patch b/libqzeitgeist-0.8.0-reduced_linking.patch
new file mode 100644
index 0000000..203bfed
--- /dev/null
+++ b/libqzeitgeist-0.8.0-reduced_linking.patch
@@ -0,0 +1,12 @@
+diff -up libqzeitgeist-0.8.0/src/CMakeLists.txt.linking libqzeitgeist-0.8.0/src/CMakeLists.txt
+--- libqzeitgeist-0.8.0/src/CMakeLists.txt.linking	2011-10-27 09:08:58.000000000 -0500
++++ libqzeitgeist-0.8.0/src/CMakeLists.txt	2011-10-31 08:04:24.037330288 -0500
+@@ -70,7 +70,7 @@ add_custom_command(OUTPUT ${CMAKE_CURREN
+                    )
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifestation.h ${CMAKE_CURRENT_BINARY_DIR}/interpretation.h DESTINATION include/QZeitgeist)
+ 
+-target_link_libraries(qzeitgeist ${QT_LIBRARIES} ${QDBUS_LDFLAGS})
++target_link_libraries(qzeitgeist ${QT_QTDBUS_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QDBUS_LDFLAGS})
+ set_target_properties(qzeitgeist PROPERTIES VERSION "${QZEITGEIST_VERSION}"
+                       VERSION ${QZEITGEIST_VERSION}
+                       SOVERSION ${QZEITGEIST_LIB_SOVERSION}
diff --git a/libqzeitgeist.spec b/libqzeitgeist.spec
index 7070282..b551306 100644
--- a/libqzeitgeist.spec
+++ b/libqzeitgeist.spec
@@ -2,12 +2,16 @@
 Name:    libqzeitgeist
 Summary: Qt Zeitgeist Library
 Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?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
+# reduce linking in libqzeitgeist 
+Patch50: libqzeitgeist-0.8.0-reduced_linking.patch
+
 ## upstream patches
 # fix linking (don't link the Qt world, including QtWebkit, only use QT_DECLARATIVE_LIBRARIES)
 # consistently use QT_IMPORTS_DIR
@@ -31,6 +35,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup -q 
 
+%patch50 -p1 -b .reduced_linking
 %patch100 -p1 -b .declarative
 
 
@@ -71,6 +76,9 @@ test "$(pkg-config --modversion QZeitgeist)" = "%{version}"
 
 
 %changelog
+* Mon Oct 31 2011 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-3
+- reduced linking for libqzeitgeist too
+
 * Mon Oct 31 2011 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-2
 - declarative patch