A bit more open permissions

diff --git a/lui-solr.spec b/lui-solr.spec
index d629532..c29012a 100644 (file)
--- a/lui-solr.spec
+++ b/lui-solr.spec
@@ -1,7 +1,7 @@
 Summary: Local Unified Index (Solr) 
 Name: masterkey-lui-solr
-Version: 0.1.0
-Release: 1.indexdata
+Version: 0.1.2
+Release: 5.indexdata
 License: IndexData
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -39,19 +39,22 @@ 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
-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
-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}/%{_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
 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
 
+# 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}
 
@@ -64,9 +67,11 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(755,tomcat,tomcat)
 %{_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)