[strigi] strigi-0.7.5 (#726507)
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 29 21:56:36 UTC 2011
commit fd89890b6ec811c5e0580a87c741b2bfd2763e47
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jul 29 17:02:07 2011 -0500
strigi-0.7.5 (#726507)
.gitignore | 3 +-
sources | 2 +-
strigi-0.6.2-multilib.patch | 108 ---------------------------------------
strigi-0.7.2-kdebug234398.patch | 12 ----
strigi-0.7.2-no_rpm.patch | 80 -----------------------------
strigi-0.7.5-no_rpm.patch | 72 ++++++++++++++++++++++++++
strigi.spec | 33 +++++++-----
7 files changed, 93 insertions(+), 217 deletions(-)
---
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.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 <strigi/sdfinputstream.h>
+ #include <strigi/tarinputstream.h>
+ #include <strigi/mailinputstream.h>
+-#include <strigi/rpminputstream.h>
+ #include <strigi/arinputstream.h>
+ #include <strigi/zipinputstream.h>
+ #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 <rdieter at fedoraproject.org> 0.7.5-1
+- strigi-0.7.5 (#726507)
+
* Mon Jun 06 2011 Rex Dieter <rdieter at fedoraproject.org> 0.7.2-10
- drop clucene support, for now (f16+)
More information about the scm-commits
mailing list