Fix clucene2 linking problems

Updated files

diff --git a/strigi-as-needed.patch b/strigi-as-needed.patch
new file mode 100644 (file)
index 0000000..d0dcbf4
--- /dev/null
+++ b/strigi-as-needed.patch
@@ -0,0 +1,21 @@
+diff -ur strigi-0.7.7/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt strigi-0.7.7.link/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt
+--- strigi-0.7.7/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt  2011-12-07 21:28:33.000000000 +0100
++++ strigi-0.7.7.link/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt     2012-08-10 12:05:20.403237425 +0200
+@@ -1,2 +1,3 @@
+ add_executable(index2dump indexdump.cpp ../tcharutils.cpp)
+-target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS})
++target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS}
++      -lclucene-shared)
+diff -ur strigi-0.7.7/strigiutils/bin/deepfind/CMakeLists.txt strigi-0.7.7.link/strigiutils/bin/deepfind/CMakeLists.txt
+--- strigi-0.7.7/strigiutils/bin/deepfind/CMakeLists.txt       2011-08-16 14:23:16.000000000 +0200
++++ strigi-0.7.7.link/strigiutils/bin/deepfind/CMakeLists.txt  2012-08-10 12:03:25.419908148 +0200
+@@ -8,7 +8,8 @@
+ target_link_libraries(dummyindexer ${LIBSTREAMANALYZER_LIBRARIES})
+ 
+ add_library(libdeepfind STATIC deepfind.cpp)
+-target_link_libraries(libdeepfind ${LIBSTREAMANALYZER_LIBRARIES})
++target_link_libraries(libdeepfind ${LIBSTREAMANALYZER_LIBRARIES}
++      -lclucene-shared)
+ 
+ add_library(grepindexer STATIC grepindexreader.cpp grepindexmanager.cpp
+     grepindexwriter.cpp ${REGEX_SOURCES})

diff --git a/strigi.spec b/strigi.spec
index 010b8b84992e59f51e7a2f3afc0d843df3f1a8b1..2f31c96f5d5cd77689a24b8c0ccdf14640633b00 100644 (file)
--- a/strigi.spec
+++ b/strigi.spec
@@ -15,6 +15,7 @@ Group:                X11/Applications
 #Source0:      http://www.vandenoever.info/software/strigi/%{name}-%{version}.tar.bz2
 Source0:       http://rdieter.fedorapeople.org/strigi/%{name}-%{version}.tar.bz2
 # Source0-md5: d3ba1bf03978dfa793ab18c3f0c57d02
+Patch1:                %{name}-as-needed.patch
 Patch2:                %{name}-gcc47.patch
 URL:           http://strigi.sourceforge.net/
 BuildRequires: QtDBus-devel >= %{qtver}
@@ -82,6 +83,7 @@ Pliki nagłówkowe dla strigi.
 
 %prep
 %setup -q
+%patch1 -p1
 %patch2 -p1
 
 %build
@@ -148,6 +150,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libstreamanalyzer/LibStreamAnalyzerConfig.cmake
 %dir %{_libdir}/libstreams
 %{_libdir}/libstreams/LibStreamsConfig.cmake
+%{_libdir}/libstreams/LibStreamsTargets-pld.cmake
+%{_libdir}/libstreams/LibStreamsTargets.cmake
 %dir %{_includedir}/strigi
 %{_includedir}/strigi/*.h
 %{_includedir}/strigi/qtdbus