projects
/
lui-solr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comments, remove unused
[lui-solr.git]
/
lui-solr.spec
diff --git
a/lui-solr.spec
b/lui-solr.spec
index
d629532
..
b78551c
100644
(file)
--- a/
lui-solr.spec
+++ b/
lui-solr.spec
@@
-1,6
+1,6
@@
Summary: Local Unified Index (Solr)
Name: masterkey-lui-solr
Summary: Local Unified Index (Solr)
Name: masterkey-lui-solr
-Version: 0.1.0
+Version: 0.3.0
Release: 1.indexdata
License: IndexData
Group: Applications/Internet
Release: 1.indexdata
License: IndexData
Group: Applications/Internet
@@
-39,18
+39,21
@@
The LUI is part of the MasterKey suite. This package provides Tomcat 6 integrati
%install
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/war
%install
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/war
-cp -a dist/* ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/war
+cp -a dist/* ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/war
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/conf
mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/conf
-cp -a solr-conf/* ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/conf
+cp -a solr-conf/* ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/conf
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr
# cp -a etc/harvester.properties ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr
# cp -a etc/harvester.properties ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr
-mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/log/masterkey/lui/solr
+#mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/log/masterkey/lui/solr
mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/lib/masterkey/lui/solr/data
#tomcat context
mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/lib/masterkey/lui/solr/data
#tomcat context
-sed -e 's@docBase=".*"@docBase="%{_datadir}\/masterkey\/lui/solr"@g' etc/solr-tomcat-context.xml > ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr/lui-solr-context.xml
+sed -e 's@docBase=".*"@docBase="%{_datadir}\/masterkey\/lui\/solr\/war\/apache-solr-3.3.0.war"@g' etc/solr-tomcat-context.xml > ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/solr/lui-solr-context.xml
+
+# Solr config
+sed -e 's@${solr.data.dir:.*}@${solr.data.dir:%{_localstatedir}\/lib\/masterkey\/lui\/solr\/data}@g' solr-conf/solrconfig.xml > ${RPM_BUILD_ROOT}/%{_datadir}/masterkey/lui/solr/conf/solrconfig.xml
%clean
rm -fr ${RPM_BUILD_ROOT}
%clean
rm -fr ${RPM_BUILD_ROOT}
@@
-64,9
+67,11
@@
if [ $1 = 0 ]; then
fi
%files
fi
%files
-%defattr(-,root,root)
+%defattr(755,tomcat,tomcat)
%{_datadir}/masterkey/lui/solr
%{_datadir}/masterkey/lui/solr
-%attr(750,tomcat,tomcat) %dir %{_localstatedir}/lib/masterkey/lui/solr
+%{_localstatedir}/lib/masterkey/lui/solr
+%{_localstatedir}/lib/masterkey/lui/solr/data
+%attr(755,tomcat,tomcat) %dir %{_localstatedir}/lib/masterkey/lui/solr
%files -n masterkey-lui-solr-tomcat
%defattr(-,root,root)
%files -n masterkey-lui-solr-tomcat
%defattr(-,root,root)