packages: java-lucene/java-lucene.spec - don't get jars from the Internet (...

[megabajt]

Author: megabajt                     Date: Fri Dec 17 23:19:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't get jars from the Internet (db.jar, je.jar)
- install lucene.jar with fully generated MANIFEST.MF (as expected by libreoffice)
- release 6

---- Files affected:
packages/java-lucene:
   java-lucene.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/java-lucene/java-lucene.spec
diff -u packages/java-lucene/java-lucene.spec:1.12 packages/java-lucene/java-lucene.spec:1.13
--- packages/java-lucene/java-lucene.spec:1.12	Fri Apr 23 02:03:25 2010
+++ packages/java-lucene/java-lucene.spec	Sat Dec 18 00:19:21 2010
@@ -19,14 +19,18 @@
 Summary:	Text search engine library in Java
 Name:		java-%{srcname}
 Version:	2.4.1
-Release:	5
+Release:	6
 License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/lucene/java/lucene-%{version}-src.tar.gz
 # Source0-md5:	ad46595439240e10387fcbf7647705db
+Source1:	je-4.1.6.jar
+# Source1-md5:	b7cd75e409267b903c3cb8e1da1856e9
 Patch0:		%{name}-test.patch
+Patch1:		%{name}-je_jar.patch
 URL:		http://lucene.apache.org/
 BuildRequires:	ant
+BuildRequires:	db-java
 BuildRequires:	java-commons-digester
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
@@ -68,9 +72,14 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 %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
 
 %build
-CLASSPATH=$(build-classpath commons-digester)
+CLASSPATH=$(build-classpath commons-digester db)
 
 export LC_ALL=en_US
 
@@ -95,13 +104,13 @@
 	$(find src/java/org/apache/lucene -name '*.java')
 %endif
 
-%jar -cf %{srcname}-%{version}.jar -C build/classes/java .
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+
+cp -a build/%{srcname}-core-2.4.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
 CONTRIB_PACKAGES="analyzers benchmark highlighter instantiated lucli memory misc queries regex similarity snowball spellchecker surround swing wikipedia wordnet xml-query-parser"
@@ -131,7 +140,8 @@
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}-core-%{version}.jar
+%{_javadir}/%{srcname}-core.jar
 %{_javadir}/%{srcname}.jar
 
 %if %{with javadoc}
@@ -188,6 +198,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/12/17 23:19:21  megabajt
+- don't get jars from the Internet (db.jar, je.jar)
+- install lucene.jar with fully generated MANIFEST.MF (as expected by libreoffice)
+- release 6
+
 Revision 1.12  2010/04/23 00:03:25  pawelz
 - Don't force specific jdk.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-lucene/java-lucene.spec?r1=1.12&r2=1.13&f=u