Author: glen Date: Wed May 9 10:49:19 2012 GMT Module: packages Tag: HEAD ---- Log message: - example instance as separate core, default config thus multi core capable
---- Files affected: packages/solr: solr.spec (1.11 -> 1.12) , solr.xml (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/solr/solr.spec diff -u packages/solr/solr.spec:1.11 packages/solr/solr.spec:1.12 --- packages/solr/solr.spec:1.11 Sun May 6 22:04:59 2012 +++ packages/solr/solr.spec Wed May 9 12:49:14 2012 @@ -20,6 +20,7 @@ Source0: http://www.apache.org/dist/lucene/solr/%{version}/apache-%{name}-%{version}.tgz # Source0-md5: ac11ef4408bb015aa3a5eefcb1047aec Source1: %{name}-context.xml +Source2: solr.xml URL: https://lucene.apache.org/solr/ #BuildRequires: java-ivy >= 2.2.0 #BuildRequires: java-junit @@ -33,8 +34,6 @@ 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 @@ -84,12 +83,19 @@ cp -p dist/apache-solr-%{version}.war $RPM_BUILD_ROOT%{webappdir}/%{name}.war # Install tomcat context descriptor -install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_sharedstatedir}/%{name}/data,%{_tomcatconfdir}} +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 -cp -a example/solr/conf/* $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/conf +# setup cores configuration +install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/solr.xml +ln -s %{_sysconfdir}/%{name}/solr.xml $RPM_BUILD_ROOT%{_sharedstatedir}/%{name} + +# setup sample instance +install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/example/data +cp -a example/solr/conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/example +ln -s %{_sysconfdir}/%{name}/example $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}/example/conf %clean rm -rf $RPM_BUILD_ROOT @@ -101,25 +107,31 @@ %defattr(644,root,root,755) %doc CHANGES.txt NOTICE.txt README.txt %dir %{_sysconfdir}/%{name} -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.html -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.txt -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf -%dir %{_sysconfdir}/%{name}/lang -%{_sysconfdir}/%{name}/lang/*.txt -%dir %{_sysconfdir}/%{name}/velocity -%{_sysconfdir}/%{name}/velocity/*.css -%{_sysconfdir}/%{name}/velocity/*.js -%{_sysconfdir}/%{name}/velocity/*.vm -%dir %{_sysconfdir}/%{name}/xslt -%{_sysconfdir}/%{name}/xslt/*.xsl - +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/tomcat-context.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/solr.xml %{_tomcatconfdir}/%{name}.xml %dir %{webappdir} -%{webappdir}/*.war +%{webappdir}/solr.war %dir %{_sharedstatedir}/%{name} -%{_sharedstatedir}/%{name}/conf -%attr(2775,root,servlet) %dir %{_sharedstatedir}/%{name}/data +%{_sharedstatedir}/%{name}/solr.xml + +# sample instance configuration +%attr(750,root,servlet) %dir %{_sharedstatedir}/%{name}/example +%attr(2775,root,servlet) %dir %{_sharedstatedir}/%{name}/example/data +%{_sharedstatedir}/%{name}/example/conf +%dir %{_sysconfdir}/%{name}/example +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/example/*.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/example/*.html +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/example/*.txt +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/example/*.conf +%dir %{_sysconfdir}/%{name}/example/lang +%{_sysconfdir}/%{name}/example/lang/*.txt +%dir %{_sysconfdir}/%{name}/example/velocity +%{_sysconfdir}/%{name}/example/velocity/*.css +%{_sysconfdir}/%{name}/example/velocity/*.js +%{_sysconfdir}/%{name}/example/velocity/*.vm +%dir %{_sysconfdir}/%{name}/example/xslt +%{_sysconfdir}/%{name}/example/xslt/*.xsl # -n java-solr #%{_javadir}/apache-solr-*.jar @@ -131,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2012/05/09 10:49:14 glen +- example instance as separate core, default config thus multi core capable + Revision 1.11 2012/05/06 20:04:59 glen - BR java-ivy 2.2.0 when compiling ================================================================ Index: packages/solr/solr.xml diff -u /dev/null packages/solr/solr.xml:1.1 --- /dev/null Wed May 9 12:49:19 2012 +++ packages/solr/solr.xml Wed May 9 12:49:14 2012 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<solr persistent="true"> + <cores adminPath="/admin/cores" shareSchema="false"> + <core name="example" instanceDir="example"/ > + </cores> +</solr> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/solr/solr.spec?r1=1.11&r2=1.12 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
