SPECS: java-lucene.spec - proper bcond for Titanium - package contrib files...

[paszczus]

Author: paszczus                     Date: Sun Mar 29 16:21:53 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper bcond for Titanium
- package contrib files to -contrib subpackage
- rel 5

---- Files affected:
SPECS:
   java-lucene.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/java-lucene.spec
diff -u SPECS/java-lucene.spec:1.7 SPECS/java-lucene.spec:1.8
--- SPECS/java-lucene.spec:1.7	Sun Mar 29 10:15:49 2009
+++ SPECS/java-lucene.spec	Sun Mar 29 18:21:48 2009
@@ -11,20 +11,20 @@
 #   at gnu.classpath.tools.gjdoc.Main.main(Main.java:883)
 
 %bcond_without  javadoc         # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
 %bcond_with	java_sun	# build with java-sun
+%if "%{pld_release}" == "ti"
+%define	with_java_sun	1
 %endif
 #
 %include	/usr/lib/rpm/macros.java
 #
 %define 	srcname	lucene
+%define		contrib_ver	2.4
 
 Summary:	Text search engine library in Java
 Name:		java-%{srcname}
 Version:	2.4.1
-Release:	4
+Release:	5
 License:	Apache v2.0
 Group:		Development/Languages/Java
 Source0:	http://www.apache.net.pl/lucene/java/lucene-%{version}-src.tar.gz
@@ -47,6 +47,14 @@
 nearly any application that requires full-text search, especially
 cross-platform.
 
+%package contrib
+Summary:	Contrib packages for lucene
+Group:		Development/Languages/Java
+Requires:	%{name}
+
+%description contrib
+Contrib packages for lucene.
+
 %package javadoc
 Summary:	Online manual for lucene
 Summary(pl.UTF-8):	Dokumentacja online do lucene
@@ -100,6 +108,18 @@
 cp -a %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
 ln -s %{srcname}-%{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"
+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
+done
+cp -a 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
+ln -s %{srcname}-bdb-je-%{contrib_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je.jar
+
 # javadoc
 %if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
@@ -125,12 +145,58 @@
 %ghost %{_javadocdir}/%{srcname}
 %endif
 
+%files contrib
+%defattr(644,root,root,755)
+%{_javadir}/%{srcname}-analyzers-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-analyzers.jar
+%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-bdb-je-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-bdb-je.jar
+%{_javadir}/%{srcname}-bdb.jar
+%{_javadir}/%{srcname}-benchmark-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-benchmark.jar
+%{_javadir}/%{srcname}-highlighter-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-highlighter.jar
+%{_javadir}/%{srcname}-instantiated-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-instantiated.jar
+%{_javadir}/%{srcname}-lucli-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-lucli.jar
+%{_javadir}/%{srcname}-memory-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-memory.jar
+%{_javadir}/%{srcname}-misc-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-misc.jar
+%{_javadir}/%{srcname}-queries-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-queries.jar
+%{_javadir}/%{srcname}-regex-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-regex.jar
+%{_javadir}/%{srcname}-similarity-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-similarity.jar
+%{_javadir}/%{srcname}-snowball-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-snowball.jar
+%{_javadir}/%{srcname}-spellchecker-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-spellchecker.jar
+%{_javadir}/%{srcname}-surround-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-surround.jar
+%{_javadir}/%{srcname}-swing-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-swing.jar
+%{_javadir}/%{srcname}-wikipedia-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-wikipedia.jar
+%{_javadir}/%{srcname}-wordnet-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-wordnet.jar
+%{_javadir}/%{srcname}-xml-query-parser-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-xml-query-parser.jar
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/03/29 16:21:48  paszczus
+- proper bcond for Titanium
+- package contrib files to -contrib subpackage
+- rel 5
+
 Revision 1.7  2009/03/29 08:15:49  paszczus
 - build contrib packages too; rel 4
 
@@ -153,4 +219,3 @@
 
 Revision 1.1  2009/03/27 10:18:44  paszczus
 - initial
-
================================================================

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