[apache-commons-beanutils] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit 6119abc6b32e0014d19326cf3aff7bbda998c597
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:54 2014 +0100
Use Requires: java-headless rebuild (#1067528)
apache-commons-beanutils.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index 37dcafc..5ded4e9 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
License: ASL 2.0
URL: http://commons.apache.org/%{base_name}
@@ -65,6 +65,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc LICENSE.txt NOTICE.txt
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.9.1-2
+- Use Requires: java-headless rebuild (#1067528)
+
* Mon Jan 13 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.9.1-1
- Update to upstream version 1.9.1
10 years, 2 months
[maven-plugin-tools] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit 71bc74f84169dcd1e42dfe3538219476e9695b87
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:54 2014 +0100
Use Requires: java-headless rebuild (#1067528)
maven-plugin-tools.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec
index 97569e9..4c17825 100644
--- a/maven-plugin-tools.spec
+++ b/maven-plugin-tools.spec
@@ -1,6 +1,6 @@
Name: maven-plugin-tools
Version: 3.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Epoch: 0
Summary: Maven Plugin Tools
@@ -232,6 +232,9 @@ ln -s maven-script/maven-script-{ant,beanshell} .
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:3.1-19
+- Use Requires: java-headless rebuild (#1067528)
+
* Mon Jan 27 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:3.1-18
- Use Maven 3.x APIs
10 years, 2 months
[maven-docck-plugin] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit aedd29b3e8aa27a249210a5b0aec63ae694172ee
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:53 2014 +0100
Use Requires: java-headless rebuild (#1067528)
maven-docck-plugin.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maven-docck-plugin.spec b/maven-docck-plugin.spec
index 4557ce4..070991e 100644
--- a/maven-docck-plugin.spec
+++ b/maven-docck-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-docck-plugin
Version: 1.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Maven Documentation Checker Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-docck-plugin/
@@ -44,6 +44,9 @@ API documentation for %{name}.
%files javadoc -f .mfiles-javadoc
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1.0-15
+- Use Requires: java-headless rebuild (#1067528)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 2 months
[maven-jxr] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit c77453d46edf05727a1b1a431d7450ba1c414f07
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:53 2014 +0100
Use Requires: java-headless rebuild (#1067528)
maven-jxr.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/maven-jxr.spec b/maven-jxr.spec
index 435e372..77f6c84 100644
--- a/maven-jxr.spec
+++ b/maven-jxr.spec
@@ -30,7 +30,7 @@
Name: maven-jxr
Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Source cross referencing tool
# BSD: maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
@@ -115,6 +115,9 @@ cp %{SOURCE1} .
%files -n maven-plugin-jxr -f .mfiles-maven-plugin-jxr
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.4-2
+- Use Requires: java-headless rebuild (#1067528)
+
* Mon Dec 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.4-1
- Update to upstream version 2.4
10 years, 2 months
[apache-commons-vfs] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit cdcbc2e0f0abdbc6c8dbfa01c91b4549dbba3d20
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:52 2014 +0100
Use Requires: java-headless rebuild (#1067528)
apache-commons-vfs.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index 593302b..af538cf 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}
Name: apache-commons-vfs
Version: 2.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Commons Virtual File System
License: ASL 2.0
Url: http://commons.apache.org/%{base_name}/
@@ -166,6 +166,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
%config %{_sysconfdir}/ant.d/%{short_name}
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.0-12
+- Use Requires: java-headless rebuild (#1067528)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 2 months
[lucene] Remove condition on test deps, they are needed anyway
by Michael Šimáček
commit e549790e5ba4fe7ad2b9fd6e4ead83f7d4178531
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Tue Mar 4 14:49:28 2014 +0100
Remove condition on test deps, they are needed anyway
lucene.spec | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index 59829ce..2ef4059 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -71,11 +71,10 @@ BuildRequires: groovy
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(org.antlr:antlr-runtime)
-%if %{with test}
+# test deps
BuildRequires: junit
BuildRequires: randomizedtesting-junit4-ant
BuildRequires: randomizedtesting-runner
-%endif
Provides: lucene-core = %{epoch}:%{version}-%{release}
# previously used by eclipse but no longer needed
10 years, 2 months
[lucene] Commit missing patch
by Michael Šimáček
commit 53158b6ef5036ac802f9161a8045e2807c9eb0f7
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Tue Mar 4 14:25:01 2014 +0100
Commit missing patch
0001-update-to-spatial4j-0.4.patch | 44 ++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/0001-update-to-spatial4j-0.4.patch b/0001-update-to-spatial4j-0.4.patch
new file mode 100644
index 0000000..019203d
--- /dev/null
+++ b/0001-update-to-spatial4j-0.4.patch
@@ -0,0 +1,44 @@
+From 981ceb96bd347218289cee47419f054d38369711 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Wed, 29 Jan 2014 11:05:33 +0100
+Subject: [PATCH] update-to-spatial4j-0.4
+
+Signed-off-by: Michael Simacek <msimacek(a)redhat.com>
+---
+ .../src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java b/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
+index 2783af3..009278f 100644
+--- a/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
++++ b/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
+@@ -19,7 +19,7 @@ package org.apache.lucene.spatial.query;
+
+ import com.spatial4j.core.context.SpatialContext;
+ import com.spatial4j.core.exception.InvalidShapeException;
+-import com.spatial4j.core.io.ShapeReadWriter;
++import com.spatial4j.core.io.LegacyShapeReadWriterFormat;
+ import com.spatial4j.core.shape.Shape;
+
+ import java.util.HashMap;
+@@ -31,7 +31,7 @@ import java.util.StringTokenizer;
+ * Parses a string that usually looks like "OPERATION(SHAPE)" into a {@link SpatialArgs}
+ * object. The set of operations supported are defined in {@link SpatialOperation}, such
+ * as "Intersects" being a common one. The shape portion is defined by {@link
+- * ShapeReadWriter#readShape(String)}. There are some optional name-value pair parameters
++ * LegacyShapeReadWriterFormat#readShape(String)}. There are some optional name-value pair parameters
+ * that follow the closing parenthesis. Example:
+ * <pre>
+ * Intersects(-10,20,-8,22) distErrPct=0.025
+@@ -69,7 +69,7 @@ public class SpatialArgsParser {
+ * @param ctx The spatial context. Mandatory.
+ * @return Not null.
+ * @throws IllegalArgumentException If there is a problem parsing the string.
+- * @throws InvalidShapeException Thrown from {@link ShapeReadWriter#readShape(String)}
++ * @throws InvalidShapeException Thrown from {@link LegacyShapeReadWriterFormat#readShape(String)}
+ */
+ public SpatialArgs parse(String v, SpatialContext ctx) throws IllegalArgumentException, InvalidShapeException {
+ int idx = v.indexOf('(');
+--
+1.8.5.3
+
10 years, 2 months
[lucene] Update to upstream version 4.6.1
by Michael Šimáček
commit 18be1b8c884f6476900c54d393a3a734b28b0146
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Mon Feb 10 12:30:48 2014 +0100
Update to upstream version 4.6.1
.gitignore | 2 +
0001-disable-ivy-settings.patch | 25 ++++
0001-disable-mecab.patch | 38 +++++
0001-fix-randomizedtesting-deps.patch | 28 ++++
0001-icu4j_v50.patch | 62 ++++++++
lucene-3.6.2-analysis-OSGi-MANIFEST.MF | 67 ---------
lucene-3.6.2-core-OSGi-MANIFEST.MF | 28 ----
lucene-4.6.1-analysis-OSGi-MANIFEST.MF | 61 ++++++++
lucene-4.6.1-core-OSGi-MANIFEST.MF | 23 +++
lucene.spec | 242 ++++++++++++--------------------
lucene_contrib_icu4j_v50.patch | 22 ---
sources | 3 +-
12 files changed, 333 insertions(+), 268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a3aa87..9f6ffe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ dev-tools.tar.xz
/lucene-3.6.2-src.tgz
/lucene-3.6.2
/noarch
+/lucene-4.6.0-src.tgz
+/lucene-4.6.1-src.tgz
diff --git a/0001-disable-ivy-settings.patch b/0001-disable-ivy-settings.patch
new file mode 100644
index 0000000..637b85a
--- /dev/null
+++ b/0001-disable-ivy-settings.patch
@@ -0,0 +1,25 @@
+From 161ffbc7a22ed1941bf897a126b80ca6a7fbf3ca Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Thu, 16 Jan 2014 16:27:10 +0100
+Subject: [PATCH] disable ivy settings
+
+Signed-off-by: Michael Simacek <msimacek(a)redhat.com>
+---
+ common-build.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/common-build.xml b/common-build.xml
+index f4720a8..fa7aee5 100644
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -350,7 +350,6 @@
+ you have an idea, fix it.
+ unless="ivy.settings.uptodate" -->
+ <!-- override: just for safety, should be unnecessary -->
+- <ivy:configure file="${common.dir}/ivy-settings.xml" override="true"/>
+ <!-- <property name="ivy.settings.uptodate" value="true"/> -->
+ </target>
+
+--
+1.8.4.2
+
diff --git a/0001-disable-mecab.patch b/0001-disable-mecab.patch
new file mode 100644
index 0000000..d0a871f
--- /dev/null
+++ b/0001-disable-mecab.patch
@@ -0,0 +1,38 @@
+From 7b926942aff8ca17201dff6eab978e851120a982 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Thu, 6 Feb 2014 13:13:24 +0100
+Subject: [PATCH] disable mecab
+
+Signed-off-by: Michael Simacek <msimacek(a)redhat.com>
+---
+ analysis/kuromoji/ivy.xml | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/analysis/kuromoji/ivy.xml b/analysis/kuromoji/ivy.xml
+index 7fa7fe0..1bfeca9 100644
+--- a/analysis/kuromoji/ivy.xml
++++ b/analysis/kuromoji/ivy.xml
+@@ -14,7 +14,7 @@
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+- under the License.
++ under the License.
+ -->
+ <ivy-module version="2.0">
+ <info organisation="org.apache.lucene" module="analyzers-kuromoji"/>
+@@ -25,11 +25,5 @@
+ </configurations>
+
+ <dependencies>
+- <dependency org="mecab" name="mecab-ipadic" rev="${/mecab/mecab-ipadic}" conf="ipadic->default">
+- <artifact name="ipadic" type=".tar.gz" url="http://mecab.googlecode.com/files/mecab-ipadic-2.7.0-20070801.tar.gz"/>
+- </dependency>
+- <dependency org="mecab" name="mecab-naist-jdic" rev="${/mecab/mecab-naist-jdic}" conf="naist->default">
+- <artifact name="mecab-naist-jdic" type=".tar.gz" url="http://sourceforge.jp/frs/redir.php?m=iij&f=/naist-jdic/53500/mecab-n..."/>
+- </dependency>
+ </dependencies>
+ </ivy-module>
+--
+1.8.5.3
+
diff --git a/0001-fix-randomizedtesting-deps.patch b/0001-fix-randomizedtesting-deps.patch
new file mode 100644
index 0000000..c61a527
--- /dev/null
+++ b/0001-fix-randomizedtesting-deps.patch
@@ -0,0 +1,28 @@
+From 315de82f4d463f90361eadbf8eb0f40074b1bc8c Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Tue, 4 Feb 2014 09:17:45 +0100
+Subject: [PATCH] fix randomizedtesting deps
+
+Signed-off-by: Michael Simacek <msimacek(a)redhat.com>
+---
+ test-framework/ivy.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test-framework/ivy.xml b/test-framework/ivy.xml
+index 6967cd4..bc02c15 100644
+--- a/test-framework/ivy.xml
++++ b/test-framework/ivy.xml
+@@ -32,8 +32,8 @@
+ <dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" transitive="false" />
+
+ <dependency org="junit" name="junit" rev="${/junit/junit}" transitive="false" conf="default->*;junit4-stdalone->*" />
+- <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" transitive="false" conf="default->*;junit4-stdalone->*" />
+- <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" transitive="false" conf="default->*;junit4-stdalone->*" />
++ <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" transitive="true" conf="default->*;junit4-stdalone->*" />
++ <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" transitive="true" conf="default->*;junit4-stdalone->*" />
+
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ </dependencies>
+--
+1.8.5.3
+
diff --git a/0001-icu4j_v50.patch b/0001-icu4j_v50.patch
new file mode 100644
index 0000000..90e28e9
--- /dev/null
+++ b/0001-icu4j_v50.patch
@@ -0,0 +1,62 @@
+From 9b35d4b2733015bd0b22666016bfdcba9f6d6e92 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Mon, 13 Jan 2014 18:36:56 +0100
+Subject: [PATCH] icu4j_v50
+
+Signed-off-by: Michael Simacek <msimacek(a)redhat.com>
+---
+ .../lucene/analysis/icu/segmentation/BreakIteratorWrapper.java | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java b/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java
+index 654d1ad..58d84bf 100644
+--- a/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java
++++ b/analysis/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;
+
+@@ -35,7 +34,7 @@ import com.ibm.icu.text.UTF16;
+ * <p>
+ * DictionaryBasedBreakIterator is a subclass of RuleBasedBreakIterator, but
+ * doesn't actually behave as a subclass: it always returns 0 for
+- * getRuleStatus():
++ * getRuleStatus():
+ * http://bugs.icu-project.org/trac/ticket/4730: Thai RBBI, no boundary type
+ * tags
+ * @lucene.experimental
+@@ -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);
+@@ -110,7 +108,7 @@ abstract class BreakIteratorWrapper {
+ * Generic BreakIterator wrapper: Either the rulestatus method is not
+ * available or always returns 0. Calculate a rulestatus here so it behaves
+ * like RuleBasedBreakIterator.
+- *
++ *
+ * Note: This is slower than RuleBasedBreakIterator.
+ */
+ static final class BIWrapper extends BreakIteratorWrapper {
+@@ -153,7 +151,7 @@ abstract class BreakIteratorWrapper {
+ if (UCharacter.isDigit(codepoint))
+ return RuleBasedBreakIterator.WORD_NUMBER;
+ else if (UCharacter.isLetter(codepoint)) {
+- // TODO: try to separately specify ideographic, kana?
++ // TODO: try to separately specify ideographic, kana?
+ // [currently all bundled as letter for this case]
+ return RuleBasedBreakIterator.WORD_LETTER;
+ }
+--
+1.8.4.2
+
diff --git a/lucene-4.6.1-analysis-OSGi-MANIFEST.MF b/lucene-4.6.1-analysis-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..fd8d02a
--- /dev/null
+++ b/lucene-4.6.1-analysis-OSGi-MANIFEST.MF
@@ -0,0 +1,61 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.6
+Bundle-SymbolicName: org.apache.lucene.analysis
+Require-Bundle: org.apache.lucene.core;bundle-version="[4.6.1)"
+Export-Package: org.apache.lucene.analysis.ar;version="4.6.1",
+ org.apache.lucene.analysis.bg;version="4.6.1",
+ org.apache.lucene.analysis.br;version="4.6.1",
+ org.apache.lucene.analysis.ca;version="4.6.1",
+ org.apache.lucene.analysis.cjk;version="4.6.1",
+ org.apache.lucene.analysis.cn;version="4.6.1",
+ org.apache.lucene.analysis.compound;version="4.6.1",
+ org.apache.lucene.analysis.compound.hyphenation;version="4.6.1",
+ org.apache.lucene.analysis.cz;version="4.6.1",
+ org.apache.lucene.analysis.da;version="4.6.1",
+ org.apache.lucene.analysis.de;version="4.6.1",
+ org.apache.lucene.analysis.el;version="4.6.1",
+ org.apache.lucene.analysis.en;version="4.6.1",
+ org.apache.lucene.analysis.es;version="4.6.1",
+ org.apache.lucene.analysis.eu;version="4.6.1",
+ org.apache.lucene.analysis.fa;version="4.6.1",
+ org.apache.lucene.analysis.fi;version="4.6.1",
+ org.apache.lucene.analysis.fr;version="4.6.1",
+ org.apache.lucene.analysis.gl;version="4.6.1",
+ org.apache.lucene.analysis.hi;version="4.6.1",
+ org.apache.lucene.analysis.hu;version="4.6.1",
+ org.apache.lucene.analysis.hunspell;version="4.6.1",
+ org.apache.lucene.analysis.hy;version="4.6.1",
+ org.apache.lucene.analysis.id;version="4.6.1",
+ org.apache.lucene.analysis.in;version="4.6.1",
+ org.apache.lucene.analysis.it;version="4.6.1",
+ org.apache.lucene.analysis.lv;version="4.6.1",
+ org.apache.lucene.analysis.miscellaneous;version="4.6.1",
+ org.apache.lucene.analysis.ngram;version="4.6.1",
+ org.apache.lucene.analysis.nl;version="4.6.1",
+ org.apache.lucene.analysis.no;version="4.6.1",
+ org.apache.lucene.analysis.path;version="4.6.1",
+ org.apache.lucene.analysis.payloads;version="4.6.1",
+ org.apache.lucene.analysis.position;version="4.6.1",
+ org.apache.lucene.analysis.pt;version="4.6.1",
+ org.apache.lucene.analysis.query;version="4.6.1",
+ org.apache.lucene.analysis.reverse;version="4.6.1",
+ org.apache.lucene.analysis.ro;version="4.6.1",
+ org.apache.lucene.analysis.ru;version="4.6.1",
+ org.apache.lucene.analysis.shingle;version="4.6.1",
+ org.apache.lucene.analysis.sinks;version="4.6.1",
+ org.apache.lucene.analysis.snowball;version="4.6.1",
+ org.apache.lucene.analysis.sv;version="4.6.1",
+ org.apache.lucene.analysis.synonym;version="4.6.1",
+ org.apache.lucene.analysis.th;version="4.6.1",
+ org.apache.lucene.analysis.tr;version="4.6.1",
+ org.apache.lucene.analysis.util;version="4.6.1",
+ org.apache.lucene.analysis.wikipedia;version="4.6.1",
+ org.apache.lucene.collation;version="4.6.1"
+Bundle-Version: 4.6.1
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: Lucene contributed extensions
+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-4.6.1-core-OSGi-MANIFEST.MF b/lucene-4.6.1-core-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..248b727
--- /dev/null
+++ b/lucene-4.6.1-core-OSGi-MANIFEST.MF
@@ -0,0 +1,23 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.6
+Bundle-SymbolicName: org.apache.lucene.core
+Import-Package: javax.management
+Export-Package: org.apache.lucene;version="4.6.1",
+ org.apache.lucene.analysis;version="4.6.1",
+ org.apache.lucene.analysis.tokenattributes;version="4.6.1",
+ org.apache.lucene.document;version="4.6.1",
+ org.apache.lucene.index;version="4.6.1",
+ org.apache.lucene.search;version="4.6.1",
+ org.apache.lucene.search.payloads;version="4.6.1",
+ org.apache.lucene.search.spans;version="4.6.1",
+ org.apache.lucene.search.similarities;version="4.6.1",
+ org.apache.lucene.store;version="4.6.1",
+ org.apache.lucene.util;version="4.6.1",
+ org.apache.lucene.util.fst;version="4.6.1",
+ org.apache.lucene.util.packed;version="4.6.1",
+ org.apache.lucene.util.mutable;version="4.6.1",
+ org.apache.lucene.util.automaton;version="4.6.1"
+Bundle-Version: 4.6.1
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: High-performance, full-featured text search engine
+Bundle-ManifestVersion: 2
diff --git a/lucene.spec b/lucene.spec
index c1eaa64..59829ce 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -28,53 +28,66 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%bcond_with test
+
Summary: High-performance, full-featured text search engine
Name: lucene
-Version: 3.6.2
-Release: 4%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
-Group: Development/Libraries
Source0: http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz
Source1: lucene-%{version}-core-OSGi-MANIFEST.MF
Source2: lucene-%{version}-analysis-OSGi-MANIFEST.MF
-Source3: ivy-conf.xml
+
+Patch0: 0001-disable-ivy-settings.patch
# 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-too...
-#tar caf dev-tools.tar.xz dev-tools/
-Source4: dev-tools.tar.xz
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: ant >= 0:1.6
-BuildRequires: ant-junit >= 0:1.6
-BuildRequires: junit
-BuildRequires: javacc
-BuildRequires: java-javadoc
-BuildRequires: jtidy
+Patch1: 0001-icu4j_v50.patch
+# ShapeReadWriter was deprecated and renamed, proper update should follow in lucene-4.7
+Patch2: 0001-update-to-spatial4j-0.4.patch
+# upstream randomizedtesting bundles it's deps
+Patch3: 0001-fix-randomizedtesting-deps.patch
+# dependencies on non-maven artifacts (tar.gz files)
+Patch4: 0001-disable-mecab.patch
+
+BuildRequires: git
+BuildRequires: simple-xml
+BuildRequires: jpackage-utils
+BuildRequires: ant
BuildRequires: regexp
-BuildRequires: apache-commons-digester
-BuildRequires: unzip
-BuildRequires: zip
-BuildRequires: java-devel >= 1:1.6.0
BuildRequires: apache-commons-compress
-BuildRequires: apache-ivy
-BuildRequires: lucene
-# for tests
-BuildRequires: subversion
-# BR for lucene-contrib
-%if 0%{?fedora}
+BuildRequires: ivy-local
BuildRequires: icu4j
+BuildRequires: httpcomponents-client
+BuildRequires: jetty
+BuildRequires: morfologik-stemming
+BuildRequires: uimaj
+BuildRequires: uima-addons
+BuildRequires: spatial4j
+BuildRequires: nekohtml
+BuildRequires: xerces-j2
+BuildRequires: groovy
+BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(org.antlr:antlr-runtime)
+
+%if %{with test}
+BuildRequires: junit
+BuildRequires: randomizedtesting-junit4-ant
+BuildRequires: randomizedtesting-runner
%endif
Provides: lucene-core = %{epoch}:%{version}-%{release}
# previously used by eclipse but no longer needed
Obsoletes: lucene-devel < %{epoch}:%{version}-%{release}
Obsoletes: lucene-demo < %{epoch}:%{version}-%{release}
+# previously distributed separately, but merged into main package
+Provides: lucene-contrib = %{version}-%{release}
+Obsoletes: lucene-contrib < %{version}-%{release}
+
BuildArch: noarch
-Requires: jpackage-utils
+BuildRequires: maven-local
%description
Apache Lucene is a high-performance, full-featured text search
@@ -90,161 +103,92 @@ Requires: jpackage-utils
%description javadoc
%{summary}.
-%if 0%{?fedora}
-%package contrib
-Summary: Lucene contributed extensions
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description contrib
-%{summary}.
-%endif
-
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -S git -n %{name}-%{version}
+
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
-tar xfs %{SOURCE4}
-pushd dev-tools
-find . -name "pom.xml.template" -exec sed -i "s/@version@/%{version}/g" '{}' \;
-popd
+sed -i 's|groovy-all|groovy|' common-build.xml
-iconv --from=ISO-8859-1 --to=UTF-8 CHANGES.txt > CHANGES.txt.new
+# incorrect artifact type
+sed -i 's/type="orbit"//' replicator/ivy.xml
-# prepare pom files (replace @version@ with real version)
-find . -name '*pom.xml.template' -exec \
- sed -i "s:@version@:%{version}:g" '{}' \;
+# interferes with XMvn local resolution
+rm ivy-settings.xml
-cp %{SOURCE3} .
+# ivy.xml files don't specify revision, which makes them invalid and would
+# crash %%mvn_artifact
+find . -name 'ivy.xml' -exec sed -i 's/<info/<info revision="%{version}"/' {} \;
-#modify artifactIds to make it easier to map to fedora
-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
+# failing due to old version of nekohtml
+rm benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java
-# ICU4J v50 compatibility
-%patch0 -p2
+# old API
+rm -r replicator/src/test/*
+rm -r spatial/src/test/*
%build
-mkdir -p docs
-mkdir -p lib
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=$(build-classpath jtidy regexp commons-digester apache-commons-compress ivy)
-
-
-ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
- -Djavacc.home=%{_bindir}/javacc \
- -Djavacc.jar=%{_javadir}/javacc.jar \
- -Djavacc.jar.dir=%{_javadir} \
- -Djavadoc.link=file://%{_javadocdir}/java \
+ant jar javadocs \
+ %if %{with test}
+ test \
+ %endif
+ -Divy.mode=local \
-Dversion=%{version} \
- -Dfailonjavadocwarning=false \
- -Dmaven-tasks.uptodate=true \
- jar-lucene-core docs javadocs-core
-
-%if 0%{?fedora}
-export CLASSPATH=$(build-classpath jtidy regexp commons-digester apache-commons-compress icu4j ivy)
-ant -Divy.settings.file=ivy-conf.xml -Dbuild.sysclasspath=first \
- -Djavacc.home=%{_bindir}/javacc \
- -Djavacc.jar=%{_javadir}/javacc.jar \
- -Djavacc.jar.dir=%{_javadir} \
-Djavadoc.link=file://%{_javadocdir}/java \
- -Dversion=%{version} \
- -Dfailonjavadocwarning=false \
- -Dmaven-tasks.uptodate=true \
- jar-test-framework javadocs build-contrib
-%endif
-
+ -Dfailonjavadocwarning=false
+
# add missing OSGi metadata to manifests
mkdir META-INF
unzip -o build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
-cp %{SOURCE1} META-INF/MANIFEST.MF
+cat %{SOURCE1} >> META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
zip -u build/core/lucene-core-%{version}.jar META-INF/MANIFEST.MF
-%if 0%{?fedora}
-unzip -o build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
-cp %{SOURCE2} META-INF/MANIFEST.MF
+unzip -o build/analysis/common/lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF
+cat %{SOURCE2} >> META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
-zip -u build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
-
-mv build/contrib/analyzers/common build/contrib/analyzers/analyzers
-mv dev-tools/maven/lucene/contrib/analyzers/common dev-tools/maven/lucene/contrib/analyzers/analyzers
-%endif
+zip -u build/analysis/common/lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF
%install
-
-# jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 0644 build/core/%{name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
-
-# core pom + parents
-install -m 0644 dev-tools/maven/lucene/core/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-core.pom
-%add_maven_depmap JPP-lucene-core.pom %{name}-core.jar
-install -m 0644 dev-tools/maven/lucene/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-parent.pom
-%add_maven_depmap JPP-lucene-parent.pom
-install -m 0644 dev-tools/maven/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-solr-grandparent.pom
-%add_maven_depmap JPP-lucene-solr-grandparent.pom
-
-%if 0%{?fedora}
-# contrib jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib
-for c in benchmark demo facet grouping highlighter \
- icu instantiated join memory misc pruning queries queryparser remote \
- spatial spellchecker xml-query-parser; do
- install -m 0644 build/contrib/$c/%{name}-${c}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib/%{name}-${c}.jar
-
- install -m 0644 dev-tools/maven/lucene/contrib/$c/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.lucene-contrib-lucene-$c.pom
- %add_maven_depmap JPP.lucene-contrib-lucene-$c.pom %{name}-contrib/%{name}-${c}.jar
+for module in core benchmark classification codecs demo expressions facet \
+grouping highlighter join memory misc queries queryparser replicator sandbox \
+spatial suggest test-framework; do
+ %mvn_artifact "${module}/ivy.xml" "build/${module}/%{name}-${module}-%{version}.jar"
done
-# contrib analyzers
-for c in analyzers kuromoji phonetic smartcn stempel; do
- install -m 0644 build/contrib/analyzers/$c/%{name}-${c}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib/%{name}-${c}.jar
+%mvn_file :core %{name}/%{name}-core %{name}
- install -m 0644 dev-tools/maven/lucene/contrib/analyzers/$c/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.lucene-contrib-lucene-$c.pom
- %add_maven_depmap JPP.lucene-contrib-lucene-$c.pom %{name}-contrib/%{name}-${c}.jar
+for analyzer in common icu kuromoji morfologik phonetic smartcn stempel uima; do
+ %mvn_artifact "analysis/${analyzer}/ivy.xml" "build/analysis/${analyzer}/%{name}-analyzers-${analyzer}-%{version}.jar"
done
-# contrib pom
-install -m 0644 dev-tools/maven/lucene/contrib/pom.xml.template \
- $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-contrib.pom
-%add_maven_depmap JPP-lucene-contrib.pom
-%endif
+# suggest provides spellchecker
+%mvn_alias :suggest :%{name}-spellchecker
-# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/docs/api/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# artifacts on maven central have name prepended to artifactId
+%mvn_alias ':{*}' ':%{name}-@1'
-%files
-%doc CHANGES.txt LICENSE.txt README.txt NOTICE.txt
-%{_mavenpomdir}/JPP*pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-core.jar
+# compatibility with existing packages
+%mvn_alias ':analyzers-{*}' ':%{name}-@1'
+%mvn_alias :analyzers-common :%{name}-analyzers
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+sed -i "/rawPom/{p;s//effectivePom/g}" .xmvn-reactor
-%if 0%{?fedora}
-%files contrib
-%{_javadir}/%{name}-contrib
-%doc contrib/CHANGES.txt
-%endif
+%mvn_install -J build/docs
+
+%files -f .mfiles
+%doc CHANGES.txt LICENSE.txt README.txt NOTICE.txt MIGRATE.txt
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
%changelog
+* Mon Feb 10 2014 Michael Simacek <msimacek(a)redhat.com> - 0:4.6.1-1
+- Update to upstream version 4.6.1
+- Use XMvn to resolve ivy artifacts and for installation
+- Remove contrib subpackage (was merged into main package)
+
* Wed Nov 06 2013 Severin Gehwolf <sgehwolf(a)redhat.com> 0:3.6.2-4
- Remove unneeded BR jline. Resolves RHBZ#1023015.
diff --git a/sources b/sources
index fa1b529..d70d9ac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e438b947ab71866ee77a55248d6ec985 lucene-3.6.2-src.tgz
-edfaf2efa4e95d288e6e95fac2664890 dev-tools.tar.xz
+f35898448e8c0ae6e11a2dfe15565488 lucene-4.6.1-src.tgz
10 years, 2 months
[apache-commons-io] Use Requires: java-headless rebuild (#1067528)
by Stanislav Ochotnicky
commit 57dd3845a27175100b8715763c32ebd55af324dd
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:04:51 2014 +0100
Use Requires: java-headless rebuild (#1067528)
apache-commons-io.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 1005ea3..dfb96c9 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 2.4
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
Summary: Utilities to assist with developing IO functionality
License: ASL 2.0
@@ -50,6 +50,9 @@ sed -i 's/\r//' *.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1:2.4-11
+- Use Requires: java-headless rebuild (#1067528)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1:2.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 2 months