Author: glen Date: Tue Oct 5 17:04:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - webapp packaging, maybe even works
---- Files affected: packages/solr: solr.spec (1.7 -> 1.8) , solr-context.xml (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/solr/solr.spec diff -u packages/solr/solr.spec:1.7 packages/solr/solr.spec:1.8 --- packages/solr/solr.spec:1.7 Tue Oct 5 18:45:23 2010 +++ packages/solr/solr.spec Tue Oct 5 19:04:07 2010 @@ -13,17 +13,17 @@ # [get] Getting: http://download.carrot2.org/maven2/org/carrot2/nni/1.0.0/nni-1.0.0.jar #get-simple-xml: # [get] Getting: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar -# - package .war %include /usr/lib/rpm/macros.java Summary: Solr - open source enterprise search server Summary(pl.UTF-8): Solr - profesjonalny serwer wyszukiwarki o otwartych źródłach Name: solr Version: 1.4.1 -Release: 0.2 +Release: 0.3 License: Apache Group: Development/Languages/Java Source0: http://www.apache.org/dist/lucene/solr/%{version}/apache-%{name}-%{version}.tgz # Source0-md5: 258a020ed8c3f44e13b09e8ae46a1c84 +Source1: %{name}-context.xml URL: http://lucene.apache.org/solr/ BuildRequires: java-junit BuildRequires: jpackage-utils @@ -34,6 +34,10 @@ BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define webappdir %{_datadir}/%{name} +%define libdir %{webappdir}/WEB-INF/lib +%define logdir %{_var}/log/%{name} + %description Solr is an open source enterprise search server based on the Lucene Java search library, with XML/HTTP and JSON APIs, hit highlighting, @@ -74,23 +78,39 @@ # FIXME: where? cp -a dist/solrj-lib $RPM_BUILD_ROOT%{_javadir} -# war? where -#cp -a dist/apache-solr-%{version}.war +install -d $RPM_BUILD_ROOT%{webappdir} +cp -a dist/apache-solr-%{version}.war $RPM_BUILD_ROOT%{webappdir}/%{name}.war + +# Install tomcat context descriptor +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_tomcatconfdir}} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tomcat-context.xml +ln -sf %{_sysconfdir}/%{name}/tomcat-context.xml $RPM_BUILD_ROOT%{_tomcatconfdir}/%{name}.xml %clean rm -rf $RPM_BUILD_ROOT +%postun +%tomcat_clear_cache %{name} + %files %defattr(644,root,root,755) %{_javadir}/apache-solr-*.jar %{_javadir}/solrj-lib +%dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml +%{_tomcatconfdir}/%{name}.xml +%{webappdir} + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2010/10/05 17:04:07 glen +- webapp packaging, maybe even works + Revision 1.7 2010/10/05 16:45:23 glen - source bcond ================================================================ Index: packages/solr/solr-context.xml diff -u /dev/null packages/solr/solr-context.xml:1.1 --- /dev/null Tue Oct 5 19:04:15 2010 +++ packages/solr/solr-context.xml Tue Oct 5 19:04:07 2010 @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- $Id$ --> +<Context path="/solr" docBase="/usr/share/solr" + privileged="false" allowLinking="true"> +</Context> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/solr/solr.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
