Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/lui-solr

diff --git a/IDMETA b/IDMETA
index a36c832..bba2c3f 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 NAME=masterkey-lui-solr
-VERSION=0.1.2
+VERSION=0.2.0
 #DEBIAN_DIST="squeeze"
 #UBUNTU_DIST="lucid"

diff --git a/lui-solr.spec b/lui-solr.spec
index c29012a..4b74aa1 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.2
-Release: 5.indexdata
+Version: 0.2.0
+Release: 2.indexdata
 License: IndexData
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -50,10 +50,10 @@ mkdir -p                         ${RPM_BUILD_ROOT}/%{_sysconfdir}/masterkey/lui/
 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
+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}