packages: solr/solr.spec - add java-solr package for .jars

[glen]

Author: glen                         Date: Wed May  9 12:46:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add java-solr package for .jars

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

---- Diffs:

================================================================
Index: packages/solr/solr.spec
diff -u packages/solr/solr.spec:1.12 packages/solr/solr.spec:1.13
--- packages/solr/solr.spec:1.12	Wed May  9 12:49:14 2012
+++ packages/solr/solr.spec	Wed May  9 14:46:10 2012
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO
 # - build from source, external deps
+# - split libs in java-solr package to subpackages depending on their usage
 # NOTES:
 # - http://wiki.apache.org/solr/SolrTomcat
 #
@@ -20,13 +21,14 @@
 Source0:	http://www.apache.org/dist/lucene/solr/%{version}/apache-%{name}-%{version}.tgz
 # Source0-md5:	ac11ef4408bb015aa3a5eefcb1047aec
 Source1:	%{name}-context.xml
-Source2:	solr.xml
+Source2:	%{name}.xml
 URL:		https://lucene.apache.org/solr/
 #BuildRequires:	java-ivy >= 2.2.0
 #BuildRequires:	java-junit
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	java-%{name} = %{version}-%{release}
 Requires:	jpackage-utils
 Requires:	tomcat
 Obsoletes:	apache-solr < 3.6.0
@@ -48,6 +50,25 @@
 administracyjnym WWW. Działa w kontenerze serwletowym Javy, takim jak
 Tomcat.
 
+%package -n java-%{name}
+Summary:	Solr libraries
+Group:		Libraries/Java
+Requires:	jpackage-utils
+
+%description -n java-%{name}
+Solr libraries:
+- analysis-extras
+- cell
+- clustering
+- core
+- dataimporthandler
+- dataimporthandler-extras
+- langid
+- solrj
+- test-framework
+- uima
+- velocity
+
 %prep
 %setup -q -n apache-%{name}-%{version}
 
@@ -67,22 +88,19 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
-# TODO: java-solr package
+# install .jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-for jar in dist/*.jar; do
-	cp -a $jar $RPM_BUILD_ROOT%{_javadir}
-	basejar=$(basename $jar -%{version}.jar).jar
-	ln -s $(basename $jar) $RPM_BUILD_ROOT%{_javadir}/$basejar
+for a in dist/apache-solr-*.jar; do
+	jar=${a##*/}
+	cp -p dist/$jar $RPM_BUILD_ROOT%{_javadir}
+	ln -s $jar $RPM_BUILD_ROOT%{_javadir}/${jar%%-%{version}.jar}.jar
 done
-# FIXME: where?
-cp -a dist/solrj-lib $RPM_BUILD_ROOT%{_javadir}
-%endif
 
+# install webapp
 install -d $RPM_BUILD_ROOT%{webappdir}
 cp -p dist/apache-solr-%{version}.war $RPM_BUILD_ROOT%{webappdir}/%{name}.war
 
-# Install tomcat context descriptor
+# install tomcat context descriptor
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_tomcatconfdir}}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml
 ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml
@@ -133,8 +151,9 @@
 %dir %{_sysconfdir}/%{name}/example/xslt
 %{_sysconfdir}/%{name}/example/xslt/*.xsl
 
-# -n java-solr
-#%{_javadir}/apache-solr-*.jar
+%files -n java-%{name}
+%defattr(644,root,root,755)
+%{_javadir}/apache-solr-*.jar
 #%{_javadir}/solrj-lib
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -143,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2012/05/09 12:46:10  glen
+- add java-solr package for .jars
+
 Revision 1.12  2012/05/09 10:49:14  glen
 - example instance as separate core, default config thus multi core capable
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/solr/solr.spec?r1=1.12&r2=1.13