[kdepim-runtime] fix linking wrt convenience lib nepomukfeederpluginlib

Rex Dieter rdieter at fedoraproject.org
Mon Dec 5 05:33:17 UTC 2011


commit fdf2ffaacb3f43f7b3f5f3d277ff03567915a29d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Dec 4 23:33:55 2011 -0600

    fix linking wrt convenience lib nepomukfeederpluginlib

 ...time-4.7.90-nepomukfeederpluginlib_static.patch |   12 ++++++++++++
 kdepim-runtime.spec                                |    7 +++++++
 2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch b/kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
new file mode 100644
index 0000000..9a7821b
--- /dev/null
+++ b/kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
@@ -0,0 +1,12 @@
+diff -up kdepim-runtime-4.7.90/agents/nepomukfeeder/plugin/CMakeLists.txt.nepomukfeederpluginlib_static kdepim-runtime-4.7.90/agents/nepomukfeeder/plugin/CMakeLists.txt
+--- kdepim-runtime-4.7.90/agents/nepomukfeeder/plugin/CMakeLists.txt.nepomukfeederpluginlib_static	2011-09-26 04:44:15.000000000 -0500
++++ kdepim-runtime-4.7.90/agents/nepomukfeeder/plugin/CMakeLists.txt	2011-12-04 23:03:20.977409804 -0600
+@@ -1,7 +1,7 @@
+ 
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
+ 
+-kde4_add_library(nepomukfeederpluginlib nepomukfeederplugin.cpp nepomukfeederutils.cpp)
++kde4_add_library(nepomukfeederpluginlib STATIC nepomukfeederplugin.cpp nepomukfeederutils.cpp)
+ target_link_libraries(nepomukfeederpluginlib
+     ${KDE4_KDECORE_LIBS}
+     ${KDEPIMLIBS_AKONADI_LIBS}
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index cb67106..977e6e4 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -22,6 +22,8 @@ Patch1: kdepim-runtime-4.7.2-nepomuk_notification.patch
 ## upstreamable patches
 # Enable SQLite support in akonadi
 Patch50: kdepim-runtime-4.7.1-sqlite-support.patch
+# fix linking wrt convenience lib nepomukfeederpluginlib
+Patch51: kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
 
 ## upstream patches
 
@@ -73,6 +75,7 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 ## FIXME, rebase? -- rex
 #patch1 -p1 -b .nepomuk_notification
 %patch50 -p1 -b .sqlite-support
+%patch51 -p1 -b .nepomukfeederpluginlib_static
 
 
 %build
@@ -142,10 +145,14 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/akonadi/
 %{_kde4_appsdir}/akonadi_knut_resource/
 %{_kde4_appsdir}/akonadi_maildispatcher_agent/
+%dir %{_datadir}/ontology/kde/
+%{_datadir}/ontology/kde/aneo.*
 
+# no headers = no api?  why keep -devel around? --rex
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so
+%{_kde4_libdir}/libnepomukfeederpluginlib.a
 
 %files libs
 %defattr(-,root,root,-)


More information about the scm-commits mailing list