rpms/strigi/devel strigi-0.7.2-no_rpm.patch,NONE,1.1
Rex Dieter
rdieter at fedoraproject.org
Mon Jul 12 19:50:17 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/strigi/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14056
Added Files:
strigi-0.7.2-no_rpm.patch
Log Message:
import
strigi-0.7.2-no_rpm.patch:
streamanalyzer/CMakeLists.txt | 2 +-
streamanalyzer/streamanalyzer.cpp | 4 ++--
streams/CMakeLists.txt | 2 +-
streams/archivereader.cpp | 6 +++---
streams/tests/CMakeLists.txt | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE strigi-0.7.2-no_rpm.patch ---
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
More information about the scm-commits
mailing list