diff --git a/.gitignore b/.gitignore index 8d1e7da..32f024e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -strigi-0.7.2.tar.bz2 +/strigi-0.7.2.tar.bz2 +/strigi-0.7.5.tar.bz2 diff --git a/sources b/sources index 1abcf82..9eaa511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca09ba176cf3ffe9afce4d92f38f9a85 strigi-0.7.2.tar.bz2 +0559e2ab65d187d30916e9ffe36e0fb6 strigi-0.7.5.tar.bz2 diff --git a/strigi-0.6.2-multilib.patch b/strigi-0.6.2-multilib.patch deleted file mode 100644 index ee376a8..0000000 --- a/strigi-0.6.2-multilib.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -up strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake ---- strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake.multilib 2009-01-03 04:06:13.000000000 -0600 -+++ strigi-0.6.2/src/streams/strigi/strigiconfig.h.cmake 2009-01-09 07:06:12.000000000 -0600 -@@ -83,104 +83,6 @@ - # include - #endif - --// our needed types --#if !@HAVE_INT8_T@ -- #define HAVE_INT8_T 1 -- #if ${SIZEOF_CHAR}==1 //is char one byte? -- typedef signed char int8_t; -- #else -- #error Could not determine type for int8_t! -- #endif --#endif -- --#if !@HAVE_UINT8_T@ -- #define HAVE_UINT8_T 1 -- #if ${SIZEOF_CHAR}==1 //is char one byte? -- typedef unsigned char uint8_t; -- #else -- #error Could not determine type for uint8_t! -- #endif --#endif -- --#if !@HAVE_INT16_T@ -- #define HAVE_INT16_T 1 -- #if ${SIZEOF_SHORT}==2 //is short two bytes? -- typedef short int16_t; -- #else -- #error Could not determine type for int16_t! -- #endif --#endif -- --#if !@HAVE_UINT16_T@ -- #define HAVE_UINT16_T 1 -- #if ${SIZEOF_SHORT}==2 //is short two bytes? -- typedef unsigned short uint16_t; -- #else -- #error Could not determine type for uint16_t! -- #endif --#endif -- --#if !@HAVE_INT32_T@ -- #define HAVE_INT32_T 1 -- #if ${SIZEOF_INT}==4 //is int four bytes? -- typedef int int32_t; -- #elif ${SIZEOF_LONG}==4 //is long four bytes? -- typedef long int32_t; -- #else -- #error Could not determine type for int32_t! -- #endif --#endif -- --#if !@HAVE_UINT32_T@ -- #define HAVE_UINT32_T 1 -- #if ${SIZEOF_INT}==4 //is int four bytes? -- typedef unsigned int uint32_t; -- #elif ${SIZEOF_LONG}==4 //is long four bytes? -- typedef unsigned long uint32_t; -- #else -- #error Could not determine type for uint32_t! -- #endif --#endif -- --#if !@HAVE_INT64_T@ -- #define HAVE_INT64_T 1 -- #if ${SIZEOF_LONG}==8 -- typedef long int64_t; -- #elif ${SIZEOF_LONGLONG}==8 -- typedef long long int64_t; -- #else -- #error Could not determine type for int64_t! -- #endif --#endif -- --#if !@HAVE_UINT64_T@ -- #define HAVE_UINT64_T 1 -- #if ${SIZEOF_LONG}==8 -- typedef unsigned long uint64_t; -- #elif ${SIZEOF_LONGLONG}==8 -- typedef unsigned long long uint64_t; -- #elif defined(HAVE___INT64) -- typedef unsigned __int64 uint64_t; -- #else -- #error Could not determine type for uint64_t! -- #endif --#endif -- --#if !@HAVE_UINT@ -- typedef unsigned int uint; -- #define HAVE_UINT 1 --#endif -- --#if !@HAVE_SIZE_T@ -- #ifndef _SIZE_T_DEFINED -- #ifndef HAVE_SIZE_T -- typedef unsigned int size_t; -- #define HAVE_SIZE_T 1 -- #endif -- #define _SIZE_T_DEFINED 1 // kdewin32 define -- #endif --#endif -- - #cmakedefine __STRIGI_HAVE_GCC_VISIBILITY - - /** diff --git a/strigi-0.7.2-kdebug234398.patch b/strigi-0.7.2-kdebug234398.patch deleted file mode 100644 index b0807f1..0000000 --- a/strigi-0.7.2-kdebug234398.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp.kde234398 strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp ---- strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp.kde234398 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp 2010-06-30 08:39:35.124448418 -0500 -@@ -284,7 +284,7 @@ FlacEndAnalyzer::analyze(Strigi::Analysi - } while( !(blocktype & 0x80) ); - - int64_t in_size = in->size(); -- if(in_size>=0) -+ if(in_size>=0 && duration>0) - indexable.addValue(factory->bitRateField,(uint32_t)(8*((in_size-in->position())/duration))); - - return 0; diff --git a/strigi-0.7.2-no_rpm.patch b/strigi-0.7.2-no_rpm.patch deleted file mode 100644 index aa0a661..0000000 --- a/strigi-0.7.2-no_rpm.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up strigi-0.7.2/src/streamanalyzer/CMakeLists.txt.no_rpm strigi-0.7.2/src/streamanalyzer/CMakeLists.txt ---- strigi-0.7.2/src/streamanalyzer/CMakeLists.txt.no_rpm 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streamanalyzer/CMakeLists.txt 2010-07-12 14:31:46.777965022 -0500 -@@ -46,7 +46,7 @@ set(streamanalyzer_SRCS - endanalyzers/oleendanalyzer.cpp - endanalyzers/pdfendanalyzer.cpp - endanalyzers/pngendanalyzer.cpp -- endanalyzers/rpmendanalyzer.cpp -+# endanalyzers/rpmendanalyzer.cpp - endanalyzers/sdfendanalyzer.cpp - endanalyzers/tarendanalyzer.cpp - endanalyzers/textendanalyzer.cpp -diff -up strigi-0.7.2/src/streamanalyzer/streamanalyzer.cpp.no_rpm strigi-0.7.2/src/streamanalyzer/streamanalyzer.cpp ---- strigi-0.7.2/src/streamanalyzer/streamanalyzer.cpp.no_rpm 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streamanalyzer/streamanalyzer.cpp 2010-07-12 14:31:46.778964394 -0500 -@@ -34,7 +34,7 @@ - #include "zipexeendanalyzer.h" - #include "odfendanalyzer.h" - #include "oleendanalyzer.h" --#include "rpmendanalyzer.h" -+// #include "rpmendanalyzer.h" - #include "cpioendanalyzer.h" - #include "pdfendanalyzer.h" - #include "sdfendanalyzer.h" -@@ -319,7 +319,7 @@ StreamAnalyzerPrivate::initializeEndFact - addFactory(new OdfEndAnalyzerFactory()); - addFactory(new ZipEndAnalyzerFactory()); - addFactory(new ZipExeEndAnalyzerFactory()); -- addFactory(new RpmEndAnalyzerFactory()); -+// addFactory(new RpmEndAnalyzerFactory()); - addFactory(new CpioEndAnalyzerFactory()); - addFactory(new PngEndAnalyzerFactory()); - addFactory(new BmpEndAnalyzerFactory()); -diff -up strigi-0.7.2/src/streams/archivereader.cpp.no_rpm strigi-0.7.2/src/streams/archivereader.cpp ---- strigi-0.7.2/src/streams/archivereader.cpp.no_rpm 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streams/archivereader.cpp 2010-07-12 14:33:35.755965441 -0500 -@@ -21,7 +21,7 @@ - #include "sdfinputstream.h" - #include "tarinputstream.h" - #include "mailinputstream.h" --#include "rpminputstream.h" -+// #include "rpminputstream.h" - #include "arinputstream.h" - #include "zipinputstream.h" - #include "archiveentrycache.h" -@@ -177,8 +177,8 @@ ArchiveReader::ArchiveReaderPrivate::Arc - - subs.insert(SubsPair(MailInputStream::checkHeader, - MailInputStream::factory)); -- subs.insert(SubsPair(RpmInputStream::checkHeader, -- RpmInputStream::factory)); -+// subs.insert(SubsPair(RpmInputStream::checkHeader, -+// RpmInputStream::factory)); - subs.insert(SubsPair(ArInputStream::checkHeader, - ArInputStream::factory)); - subs.insert(SubsPair(ZipInputStream::checkHeader, -diff -up strigi-0.7.2/src/streams/CMakeLists.txt.no_rpm strigi-0.7.2/src/streams/CMakeLists.txt ---- strigi-0.7.2/src/streams/CMakeLists.txt.no_rpm 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streams/CMakeLists.txt 2010-07-12 14:31:46.778964394 -0500 -@@ -30,7 +30,7 @@ set(streams_SRCS - lzmainputstream.cpp - mailinputstream.cpp - oleinputstream.cpp -- rpminputstream.cpp -+# rpminputstream.cpp # broken on fedora, https://bugzilla.redhat.com/show_bug.cgi?id=609541 - sdfinputstream.cpp - # signatureinputstream.cpp # not done yet - skippingfileinputstream.cpp -diff -up strigi-0.7.2/src/streams/tests/CMakeLists.txt.no_rpm strigi-0.7.2/src/streams/tests/CMakeLists.txt ---- strigi-0.7.2/src/streams/tests/CMakeLists.txt.no_rpm 2010-02-03 13:03:07.000000000 -0600 -+++ strigi-0.7.2/src/streams/tests/CMakeLists.txt 2010-07-12 14:31:46.778964394 -0500 -@@ -23,7 +23,7 @@ set(streamtests - LZMAInputStreamTest.cpp - MailInputStreamTest.cpp - OleInputStreamTest.cpp -- RpmInputStreamTest.cpp -+# RpmInputStreamTest.cpp # disabled on fedora - SdfInputStreamTest.cpp - # SignatureInputStreamTest.cpp # disabled because that stream is not done - SkippingFileInputStreamTest.cpp diff --git a/strigi-0.7.5-no_rpm.patch b/strigi-0.7.5-no_rpm.patch new file mode 100644 index 0000000..3481747 --- /dev/null +++ b/strigi-0.7.5-no_rpm.patch @@ -0,0 +1,72 @@ +diff -up strigi-0.7.5/libstreamanalyzer/lib/CMakeLists.txt.no_rpm strigi-0.7.5/libstreamanalyzer/lib/CMakeLists.txt +--- strigi-0.7.5/libstreamanalyzer/lib/CMakeLists.txt.no_rpm 2011-06-02 04:29:26.000000000 -0500 ++++ strigi-0.7.5/libstreamanalyzer/lib/CMakeLists.txt 2011-07-24 00:03:45.482184976 -0500 +@@ -39,7 +39,6 @@ set(streamanalyzer_SRCS + endanalyzers/oleendanalyzer.cpp + endanalyzers/pdfendanalyzer.cpp + endanalyzers/pngendanalyzer.cpp +- endanalyzers/rpmendanalyzer.cpp + endanalyzers/sdfendanalyzer.cpp + endanalyzers/tarendanalyzer.cpp + endanalyzers/textendanalyzer.cpp +diff -up strigi-0.7.5/libstreamanalyzer/lib/streamanalyzer.cpp.no_rpm strigi-0.7.5/libstreamanalyzer/lib/streamanalyzer.cpp +--- strigi-0.7.5/libstreamanalyzer/lib/streamanalyzer.cpp.no_rpm 2011-06-02 04:29:26.000000000 -0500 ++++ strigi-0.7.5/libstreamanalyzer/lib/streamanalyzer.cpp 2011-07-24 00:06:36.284049655 -0500 +@@ -34,7 +34,6 @@ + #include "endanalyzers/zipexeendanalyzer.h" + #include "endanalyzers/odfendanalyzer.h" + #include "endanalyzers/oleendanalyzer.h" +-#include "endanalyzers/rpmendanalyzer.h" + #include "endanalyzers/cpioendanalyzer.h" + #include "endanalyzers/pdfendanalyzer.h" + #include "endanalyzers/sdfendanalyzer.h" +@@ -322,7 +321,6 @@ StreamAnalyzerPrivate::initializeEndFact + addFactory(new OdfEndAnalyzerFactory()); + addFactory(new ZipEndAnalyzerFactory()); + addFactory(new ZipExeEndAnalyzerFactory()); +- addFactory(new RpmEndAnalyzerFactory()); + addFactory(new CpioEndAnalyzerFactory()); + addFactory(new PngEndAnalyzerFactory()); + addFactory(new BmpEndAnalyzerFactory()); +diff -up strigi-0.7.5/libstreams/lib/archivereader.cpp.no_rpm strigi-0.7.5/libstreams/lib/archivereader.cpp +--- strigi-0.7.5/libstreams/lib/archivereader.cpp.no_rpm 2011-06-02 04:28:57.000000000 -0500 ++++ strigi-0.7.5/libstreams/lib/archivereader.cpp 2011-07-24 00:05:40.113751878 -0500 +@@ -21,7 +21,6 @@ + #include + #include + #include +-#include + #include + #include + #include "archiveentrycache.h" +@@ -177,8 +176,6 @@ ArchiveReader::ArchiveReaderPrivate::Arc + + subs.insert(SubsPair(MailInputStream::checkHeader, + MailInputStream::factory)); +- subs.insert(SubsPair(RpmInputStream::checkHeader, +- RpmInputStream::factory)); + subs.insert(SubsPair(ArInputStream::checkHeader, + ArInputStream::factory)); + subs.insert(SubsPair(ZipInputStream::checkHeader, +diff -up strigi-0.7.5/libstreams/lib/CMakeLists.txt.no_rpm strigi-0.7.5/libstreams/lib/CMakeLists.txt +--- strigi-0.7.5/libstreams/lib/CMakeLists.txt.no_rpm 2011-06-02 04:28:57.000000000 -0500 ++++ strigi-0.7.5/libstreams/lib/CMakeLists.txt 2011-07-24 00:03:45.522184473 -0500 +@@ -22,7 +22,6 @@ set(streams_SRCS + lzmainputstream.cpp + mailinputstream.cpp + oleinputstream.cpp +- rpminputstream.cpp + sdfinputstream.cpp + # signatureinputstream.cpp # not done yet + skippingfileinputstream.cpp +diff -up strigi-0.7.5/libstreams/tests/api/CMakeLists.txt.no_rpm strigi-0.7.5/libstreams/tests/api/CMakeLists.txt +--- strigi-0.7.5/libstreams/tests/api/CMakeLists.txt.no_rpm 2011-06-02 04:28:57.000000000 -0500 ++++ strigi-0.7.5/libstreams/tests/api/CMakeLists.txt 2011-07-24 00:03:45.523184461 -0500 +@@ -13,7 +13,6 @@ set(streamtests + LZMAInputStreamTest.cpp + MailInputStreamTest.cpp + OleInputStreamTest.cpp +- RpmInputStreamTest.cpp + SdfInputStreamTest.cpp + # SignatureInputStreamTest.cpp # disabled because that stream is not done + StringTerminatedSubStreamTest.cpp diff --git a/strigi.spec b/strigi.spec index 5770c27..f32c67a 100644 --- a/strigi.spec +++ b/strigi.spec @@ -7,8 +7,8 @@ %endif Name: strigi -Version: 0.7.2 -Release: 10%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: A desktop search program Group: Applications/Productivity License: LGPLv2+ @@ -24,11 +24,9 @@ Patch0: strigi-0.6.2-multilib.patch # disable rpm indexing, http://bugzilla.redhat.com/609541 # until fixed upstream, # https://sourceforge.net/tracker/?func=detail&aid=3016947&group_id=171000&atid=856302 -Patch1: strigi-0.7.2-no_rpm.patch +Patch1: strigi-0.7.5-no_rpm.patch ## upstream patches -# http://bugs.kde.org/234398 -Patch100: strigi-0.7.2-kdebug234398.patch BuildRequires: bison BuildRequires: bzip2-devel @@ -76,16 +74,17 @@ Strigi search engine libraries %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} -%patch0 -p1 -b .multilib + %patch1 -p1 -b .no_rpm -%patch100 -p1 -b .kdebug234398 %build mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} \ - -DENABLE_CLUCENE:BOOL=%{?clucene:ON}%{!?clucene:OFF} \ + -DENABLE_CLUCENE:BOOL=OFF \ + -DENABLE_CLUCENE_NG:BOOL=OFF \ + -DENABLE_FFMPEG:BOOL=OFF \ -DLIB_DESTINATION:PATH=%{_libdir} \ %{?_cmake_skip_rpath} \ .. @@ -107,10 +106,6 @@ desktop-file-install \ install -p -m644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/strigi-daemon.desktop -%check -make -C %{_target_platform}/tests - - %clean rm -rf %{buildroot} @@ -122,7 +117,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README TODO +%doc AUTHORS COPYING ChangeLog %{_bindir}/* %{_datadir}/applications/*strigiclient.desktop %{_datadir}/dbus-1/services/*.service @@ -134,8 +129,13 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so -%{_libdir}/pkgconfig/libstream*.pc -%{_libdir}/strigi/*.cmake +%{_libdir}/pkgconfig/libstreamanalyzer.pc +%{_libdir}/pkgconfig/libstreams.pc +%{_libdir}/strigi/StrigiConfig.cmake +%{_libdir}/libsearchclient/ +%{_libdir}/libstreamanalyzer/ +%{_libdir}/libstreams/ + %{_includedir}/strigi/ %files libs @@ -153,6 +153,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 29 2011 Rex Dieter 0.7.5-1 +- strigi-0.7.5 (#726507) + * Mon Jun 06 2011 Rex Dieter 0.7.2-10 - drop clucene support, for now (f16+)