diff --git a/.gitignore b/.gitignore index 6f9b43c..5596e37 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ lucene-2.4.1-src.tar.gz /lucene-2.9.4-src.tar.gz /lucene-3.6.0-src.tgz dev-tools.tar.xz +/lucene-3.6.2-src.tgz diff --git a/lucene-3.6.0-analysis-OSGi-MANIFEST.MF b/lucene-3.6.0-analysis-OSGi-MANIFEST.MF deleted file mode 100644 index 05777f5..0000000 --- a/lucene-3.6.0-analysis-OSGi-MANIFEST.MF +++ /dev/null @@ -1,67 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Vendor: The Apache Software Foundation -Bundle-Localization: plugin -X-Compile-Target-JDK: 1.5 -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-SymbolicName: org.apache.lucene.analysis -Require-Bundle: org.apache.lucene.core;bundle-version="[3.6.0,4.0.0)" -Export-Package: org.apache.lucene.analysis.ar;version="3.6.0", - org.apache.lucene.analysis.bg;version="3.6.0", - org.apache.lucene.analysis.br;version="3.6.0", - org.apache.lucene.analysis.ca;version="3.6.0", - org.apache.lucene.analysis.cjk;version="3.6.0", - org.apache.lucene.analysis.cn;version="3.6.0", - org.apache.lucene.analysis.compound;version="3.6.0", - org.apache.lucene.analysis.compound.hyphenation;version="3.6.0", - org.apache.lucene.analysis.cz;version="3.6.0", - org.apache.lucene.analysis.da;version="3.6.0", - org.apache.lucene.analysis.de;version="3.6.0", - org.apache.lucene.analysis.el;version="3.6.0", - org.apache.lucene.analysis.en;version="3.6.0", - org.apache.lucene.analysis.es;version="3.6.0", - org.apache.lucene.analysis.eu;version="3.6.0", - org.apache.lucene.analysis.fa;version="3.6.0", - org.apache.lucene.analysis.fi;version="3.6.0", - org.apache.lucene.analysis.fr;version="3.6.0", - org.apache.lucene.analysis.gl;version="3.6.0", - org.apache.lucene.analysis.hi;version="3.6.0", - org.apache.lucene.analysis.hu;version="3.6.0", - org.apache.lucene.analysis.hunspell;version="3.6.0", - org.apache.lucene.analysis.hy;version="3.6.0", - org.apache.lucene.analysis.id;version="3.6.0", - org.apache.lucene.analysis.in;version="3.6.0", - org.apache.lucene.analysis.it;version="3.6.0", - org.apache.lucene.analysis.lv;version="3.6.0", - org.apache.lucene.analysis.miscellaneous;version="3.6.0", - org.apache.lucene.analysis.ngram;version="3.6.0", - org.apache.lucene.analysis.nl;version="3.6.0", - org.apache.lucene.analysis.no;version="3.6.0", - org.apache.lucene.analysis.path;version="3.6.0", - org.apache.lucene.analysis.payloads;version="3.6.0", - org.apache.lucene.analysis.position;version="3.6.0", - org.apache.lucene.analysis.pt;version="3.6.0", - org.apache.lucene.analysis.query;version="3.6.0", - org.apache.lucene.analysis.reverse;version="3.6.0", - org.apache.lucene.analysis.ro;version="3.6.0", - org.apache.lucene.analysis.ru;version="3.6.0", - org.apache.lucene.analysis.shingle;version="3.6.0", - org.apache.lucene.analysis.sinks;version="3.6.0", - org.apache.lucene.analysis.snowball;version="3.6.0", - org.apache.lucene.analysis.sv;version="3.6.0", - org.apache.lucene.analysis.synonym;version="3.6.0", - org.apache.lucene.analysis.th;version="3.6.0", - org.apache.lucene.analysis.tr;version="3.6.0", - org.apache.lucene.analysis.util;version="3.6.0", - org.apache.lucene.analysis.wikipedia;version="3.6.0" -Bundle-Version: 3.6.0 -Specification-Title: Lucene Search Engine: analyzers -Specification-Vendor: The Apache Software Foundation -Bundle-Vendor: fedoraproject.org -Bundle-Name: Lucene contributed extensions -Extension-Name: org.apache.lucene -Implementation-Title: org.apache.lucene -Import-Package: org.xml.sax;resolution:=optional, - javax.xml.parsers;resolution:=optional, - org.xml.sax.helpers;resolution:=optional -Bundle-ManifestVersion: 2 - diff --git a/lucene-3.6.0-core-OSGi-MANIFEST.MF b/lucene-3.6.0-core-OSGi-MANIFEST.MF deleted file mode 100644 index cb7c357..0000000 --- a/lucene-3.6.0-core-OSGi-MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Vendor: The Apache Software Foundation -Bundle-Localization: plugin -X-Compile-Target-JDK: 1.5 -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-SymbolicName: org.apache.lucene.core -Import-Package: javax.management -Export-Package: org.apache.lucene;version="3.6.0", - org.apache.lucene.analysis;version="3.6.0", - org.apache.lucene.analysis.standard;version="3.6.0", - org.apache.lucene.analysis.standard.std31;version="3.6.0", - org.apache.lucene.analysis.tokenattributes;version="3.6.0", - org.apache.lucene.collation;version="3.6.0", - org.apache.lucene.document;version="3.6.0", - org.apache.lucene.index;version="3.6.0", - org.apache.lucene.queryParser;version="3.6.0", - org.apache.lucene.search;version="3.6.0", - org.apache.lucene.search.function;version="3.6.0", - org.apache.lucene.search.payloads;version="3.6.0", - org.apache.lucene.search.spans;version="3.6.0", - org.apache.lucene.store;version="3.6.0", - org.apache.lucene.util;version="3.6.0", - org.apache.lucene.util.fst;version="3.6.0", - org.apache.lucene.util.packed;version="3.6.0" -Bundle-Version: 3.6.0 -Bundle-Vendor: fedoraproject.org -Bundle-Name: High-performance, full-featured text search engine -Bundle-ManifestVersion: 2 \ No newline at end of file diff --git a/lucene-3.6.2-analysis-OSGi-MANIFEST.MF b/lucene-3.6.2-analysis-OSGi-MANIFEST.MF new file mode 100644 index 0000000..ce0af8d --- /dev/null +++ b/lucene-3.6.2-analysis-OSGi-MANIFEST.MF @@ -0,0 +1,67 @@ +Manifest-Version: 1.0 +Implementation-Vendor: The Apache Software Foundation +Bundle-Localization: plugin +X-Compile-Target-JDK: 1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-SymbolicName: org.apache.lucene.analysis +Require-Bundle: org.apache.lucene.core;bundle-version="[3.6.0,4.0.0)" +Export-Package: org.apache.lucene.analysis.ar;version="3.6.2", + org.apache.lucene.analysis.bg;version="3.6.2", + org.apache.lucene.analysis.br;version="3.6.2", + org.apache.lucene.analysis.ca;version="3.6.2", + org.apache.lucene.analysis.cjk;version="3.6.2", + org.apache.lucene.analysis.cn;version="3.6.2", + org.apache.lucene.analysis.compound;version="3.6.2", + org.apache.lucene.analysis.compound.hyphenation;version="3.6.2", + org.apache.lucene.analysis.cz;version="3.6.2", + org.apache.lucene.analysis.da;version="3.6.2", + org.apache.lucene.analysis.de;version="3.6.2", + org.apache.lucene.analysis.el;version="3.6.2", + org.apache.lucene.analysis.en;version="3.6.2", + org.apache.lucene.analysis.es;version="3.6.2", + org.apache.lucene.analysis.eu;version="3.6.2", + org.apache.lucene.analysis.fa;version="3.6.2", + org.apache.lucene.analysis.fi;version="3.6.2", + org.apache.lucene.analysis.fr;version="3.6.2", + org.apache.lucene.analysis.gl;version="3.6.2", + org.apache.lucene.analysis.hi;version="3.6.2", + org.apache.lucene.analysis.hu;version="3.6.2", + org.apache.lucene.analysis.hunspell;version="3.6.2", + org.apache.lucene.analysis.hy;version="3.6.2", + org.apache.lucene.analysis.id;version="3.6.2", + org.apache.lucene.analysis.in;version="3.6.2", + org.apache.lucene.analysis.it;version="3.6.2", + org.apache.lucene.analysis.lv;version="3.6.2", + org.apache.lucene.analysis.miscellaneous;version="3.6.2", + org.apache.lucene.analysis.ngram;version="3.6.2", + org.apache.lucene.analysis.nl;version="3.6.2", + org.apache.lucene.analysis.no;version="3.6.2", + org.apache.lucene.analysis.path;version="3.6.2", + org.apache.lucene.analysis.payloads;version="3.6.2", + org.apache.lucene.analysis.position;version="3.6.2", + org.apache.lucene.analysis.pt;version="3.6.2", + org.apache.lucene.analysis.query;version="3.6.2", + org.apache.lucene.analysis.reverse;version="3.6.2", + org.apache.lucene.analysis.ro;version="3.6.2", + org.apache.lucene.analysis.ru;version="3.6.2", + org.apache.lucene.analysis.shingle;version="3.6.2", + org.apache.lucene.analysis.sinks;version="3.6.2", + org.apache.lucene.analysis.snowball;version="3.6.2", + org.apache.lucene.analysis.sv;version="3.6.2", + org.apache.lucene.analysis.synonym;version="3.6.2", + org.apache.lucene.analysis.th;version="3.6.2", + org.apache.lucene.analysis.tr;version="3.6.2", + org.apache.lucene.analysis.util;version="3.6.2", + org.apache.lucene.analysis.wikipedia;version="3.6.2" +Bundle-Version: 3.6.2 +Specification-Title: Lucene Search Engine: analyzers +Specification-Vendor: The Apache Software Foundation +Bundle-Vendor: fedoraproject.org +Bundle-Name: Lucene contributed extensions +Extension-Name: org.apache.lucene +Implementation-Title: org.apache.lucene +Import-Package: org.xml.sax;resolution:=optional, + javax.xml.parsers;resolution:=optional, + org.xml.sax.helpers;resolution:=optional +Bundle-ManifestVersion: 2 + diff --git a/lucene-3.6.2-core-OSGi-MANIFEST.MF b/lucene-3.6.2-core-OSGi-MANIFEST.MF new file mode 100644 index 0000000..4851717 --- /dev/null +++ b/lucene-3.6.2-core-OSGi-MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Implementation-Vendor: The Apache Software Foundation +Bundle-Localization: plugin +X-Compile-Target-JDK: 1.5 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-SymbolicName: org.apache.lucene.core +Import-Package: javax.management +Export-Package: org.apache.lucene;version="3.6.2", + org.apache.lucene.analysis;version="3.6.2", + org.apache.lucene.analysis.standard;version="3.6.2", + org.apache.lucene.analysis.standard.std31;version="3.6.2", + org.apache.lucene.analysis.tokenattributes;version="3.6.2", + org.apache.lucene.collation;version="3.6.2", + org.apache.lucene.document;version="3.6.2", + org.apache.lucene.index;version="3.6.2", + org.apache.lucene.queryParser;version="3.6.2", + org.apache.lucene.search;version="3.6.2", + org.apache.lucene.search.function;version="3.6.2", + org.apache.lucene.search.payloads;version="3.6.2", + org.apache.lucene.search.spans;version="3.6.2", + org.apache.lucene.store;version="3.6.2", + org.apache.lucene.util;version="3.6.2", + org.apache.lucene.util.fst;version="3.6.2", + org.apache.lucene.util.packed;version="3.6.2" +Bundle-Version: 3.6.2 +Bundle-Vendor: fedoraproject.org +Bundle-Name: High-performance, full-featured text search engine +Bundle-ManifestVersion: 2 \ No newline at end of file diff --git a/lucene.spec b/lucene.spec index 782199a..4febe3d 100644 --- a/lucene.spec +++ b/lucene.spec @@ -30,8 +30,8 @@ Summary: High-performance, full-featured text search engine Name: lucene -Version: 3.6.0 -Release: 12%{?dist} +Version: 3.6.2 +Release: 1%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -40,7 +40,10 @@ Source0: http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{vers Source1: lucene-%{version}-core-OSGi-MANIFEST.MF Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF Source3: ivy-conf.xml -#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_0/dev-tools@r1416452 +# DictionaryBasedBreakIterator was moved into the base RuleBasedBreakIterator +# in icu4j. v49 => v50 +Patch0: lucene_contrib_icu4j_v50.patch +#svn export http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_6_2/dev-tools@r1450168 #tar caf dev-tools.tar.xz dev-tools/ Source4: dev-tools.tar.xz BuildRequires: jpackage-utils >= 0:1.6 @@ -121,6 +124,8 @@ sed -i -e "s|ant-junit|ant/ant-junit|g" test-framework/ivy.xml sed -i -e "s|xercesImpl|xerces-j2|g" contrib/benchmark/ivy.xml sed -i -e "s|jakarta-regexp|regexp|g" contrib/queries/ivy.xml +# ICU4J v50 compatibility +%patch0 -p2 %build mkdir -p docs @@ -241,6 +246,10 @@ cp -pr build/docs/api/* \ %endif %changelog +* Tue Feb 26 2013 Severin Gehwolf 0:3.6.2-1 +- Update to upstream release 3.6.2 +- Fix build errors related to icu4j v50 incompatibility. + * Thu Feb 14 2013 Fedora Release Engineering - 0:3.6.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/lucene_contrib_icu4j_v50.patch b/lucene_contrib_icu4j_v50.patch new file mode 100644 index 0000000..7826a16 --- /dev/null +++ b/lucene_contrib_icu4j_v50.patch @@ -0,0 +1,22 @@ +diff --git a/lucene-3.6.2/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java b/lucene-3.6.2/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java +index 61d4b01..0626c38 100644 +--- a/lucene-3.6.2/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java ++++ b/lucene-3.6.2/contrib/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java +@@ -21,7 +21,6 @@ import java.text.CharacterIterator; + + import com.ibm.icu.lang.UCharacter; + import com.ibm.icu.text.BreakIterator; +-import com.ibm.icu.text.DictionaryBasedBreakIterator; + import com.ibm.icu.text.RuleBasedBreakIterator; + import com.ibm.icu.text.UTF16; + +@@ -67,8 +66,7 @@ abstract class BreakIteratorWrapper { + * it like a generic BreakIterator. + */ + static BreakIteratorWrapper wrap(BreakIterator breakIterator) { +- if (breakIterator instanceof RuleBasedBreakIterator +- && !(breakIterator instanceof DictionaryBasedBreakIterator)) ++ if (breakIterator instanceof RuleBasedBreakIterator) + return new RBBIWrapper((RuleBasedBreakIterator) breakIterator); + else + return new BIWrapper(breakIterator); diff --git a/sources b/sources index 40d66b0..fa1b529 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8bb2ef25734828bcc41e5a0768e45c4a lucene-3.6.0-src.tgz -4d8f5b7cd99a7f3d04c12525cd1b20bc dev-tools.tar.xz +e438b947ab71866ee77a55248d6ec985 lucene-3.6.2-src.tgz +edfaf2efa4e95d288e6e95fac2664890 dev-tools.tar.xz