commit 0479b15b15db5d43687bb003a227ec5f25f883cd
Author: Elan Ruusamäe <[email protected]>
Date: Wed Apr 3 09:41:50 2013 +0300
up to lucene 3.6.2
- cleanup unknown todo (no context where that happens and probably
outdated)
- disabled contrib and javadoc - needs more work
java-lucene.spec | 84 +++++++++++++++++++++++++++-----------------------------
1 file changed, 41 insertions(+), 43 deletions(-)
---
diff --git a/java-lucene.spec b/java-lucene.spec
index f1e0dc2..6158698 100644
--- a/java-lucene.spec
+++ b/java-lucene.spec
@@ -1,28 +1,19 @@
-# TODO:
-# - java.lang.NullPointerException
-# at
gnu.classpath.tools.doclets.htmldoclet.HtmlDoclet.printClassPage(HtmlDoclet.java:2057)
-# at
gnu.classpath.tools.doclets.htmldoclet.HtmlDoclet.run(HtmlDoclet.java:3153)
-# at
gnu.classpath.tools.doclets.AbstractDoclet.startInstance(AbstractDoclet.java:200)
-# at
gnu.classpath.tools.doclets.AbstractDoclet.start(AbstractDoclet.java:131)
-# at java.lang.reflect.Method.invoke(libgcj.so.9)
-# at gnu.classpath.tools.gjdoc.Main.startDoclet(Main.java:629)
-# at gnu.classpath.tools.gjdoc.Main.start(Main.java:1159)
-# at gnu.classpath.tools.gjdoc.Main.main(Main.java:883)
-
-%bcond_without javadoc # don't build javadoc
-%bcond_with java_sun # build with java-sun
-%include /usr/lib/rpm/macros.java
-%define srcname lucene
-%define contrib_ver 2.4
+# Conditional build:
+%bcond_with javadoc # build Lucene javadoc
+%bcond_with contrib # build Lucene contributed extensions
+
+%define contrib_ver 2.4
+%define srcname lucene
+%include /usr/lib/rpm/macros.java
Summary: Text search engine library in Java
Name: java-%{srcname}
-Version: 2.4.1
-Release: 6
+Version: 3.6.2
+Release: 0.1
License: Apache v2.0
Group: Libraries/Java
-Source0:
http://www.apache.org/dist/lucene/java/lucene-%{version}-src.tar.gz
-# Source0-md5: ad46595439240e10387fcbf7647705db
+Source0:
http://www.apache.org/dist/lucene/java/%{version}/lucene-%{version}-src.tgz
+# Source0-md5: e438b947ab71866ee77a55248d6ec985
Source1: je-4.1.6.jar
# Source1-md5: b7cd75e409267b903c3cb8e1da1856e9
Patch0: %{name}-test.patch
@@ -35,6 +26,9 @@ BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
+%if %{with contrib}
+BuildRequires: icu4j
+%endif
Requires: jpackage-utils
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,12 +64,12 @@ Javadoc pour lucene.
%prep
%setup -q -n %{srcname}-%{version}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
# FIXME: move je.jar to separate spec and use it via CLASSPATH
-mkdir contrib/db/bdb-je/lib
-cp %{SOURCE1} contrib/db/bdb-je/lib/je.jar
+install -d contrib/db/bdb-je/lib
+cp -p %{SOURCE1} contrib/db/bdb-je/lib/je.jar
%build
CLASSPATH=$(build-classpath commons-digester db)
@@ -83,23 +77,25 @@ CLASSPATH=$(build-classpath commons-digester db)
export LC_ALL=en_US
install -d build
-%ant -Dbuild.sysclasspath=only
+%ant \
+ -Dversion=%{version} \
+ -Dbuild.sysclasspath=only
-# Build contrib packages too
+%if %{with contrib}
cd contrib
CONTRIB_PACKAGES="analyzers benchmark db highlighter instantiated lucli memory
miscellaneous queries regex similarity snowball spellchecker surround swing
wikipedia wordnet xml-query-parser"
-for i in $CONTRIB_PACKAGES
-do
-cd $i
-install -d build
-%ant
-cd -
+for i in $CONTRIB_PACKAGES; do
+ cd $i
+ install -d build
+ %ant
+ cd -
done
-
cd ..
+%endif
+
%if %{with javadoc}
%javadoc -d apidocs \
- %{?with_java_sun:org.apache.lucene} \
+ org.apache.lucene \
$(find src/java/org/apache/lucene -name '*.java')
%endif
@@ -107,22 +103,22 @@ cd ..
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build/%{srcname}-core-2.4.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-core-%{version}.jar
+cp -a build/core/%{srcname}-core-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-core-%{version}.jar
ln -s %{srcname}-core-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-core.jar
ln -s %{srcname}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-# Contrib packages
+%if %{with contrib}
CONTRIB_PACKAGES="analyzers benchmark highlighter instantiated lucli memory
misc queries regex similarity snowball spellchecker surround swing wikipedia
wordnet xml-query-parser"
-for i in $CONTRIB_PACKAGES
-do
-cp -a build/contrib/$i/%{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i-%{contrib_ver}.jar
-ln -s %{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i.jar
-%jar -cf %{srcname}-$i-%{contrib_ver}.jar -C build/contrib/$i/classes/java .
+for i in $CONTRIB_PACKAGES; do
+ cp -a build/contrib/$i/%{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i-%{contrib_ver}.jar
+ ln -s %{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i.jar
+ %jar -cf %{srcname}-$i-%{contrib_ver}.jar -C
build/contrib/$i/classes/java .
done
-cp -a build/contrib/db/bdb/%{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
+cp -p build/contrib/db/bdb/%{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
ln -s %{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb.jar
-cp -a build/contrib/db/bdb-je/%{srcname}-bdb-je-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je-%{contrib_ver}.jar
+cp -p build/contrib/db/bdb-je/%{srcname}-bdb-je-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je-%{contrib_ver}.jar
ln -s %{srcname}-bdb-je-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je.jar
+%endif
# javadoc
%if %{with javadoc}
@@ -150,6 +146,7 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%ghost %{_javadocdir}/%{srcname}
%endif
+%if %{with contrib}
%files contrib
%defattr(644,root,root,755)
%{_javadir}/%{srcname}-analyzers-%{contrib_ver}.jar
@@ -190,3 +187,4 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%{_javadir}/%{srcname}-wordnet.jar
%{_javadir}/%{srcname}-xml-query-parser-%{contrib_ver}.jar
%{_javadir}/%{srcname}-xml-query-parser.jar
+%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-lucene.git/commitdiff/0479b15b15db5d43687bb003a227ec5f25f883cd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
