commit 65f8a1a7d1a6b51b23f8a832f9b38e78e2afd845 Author: gil puntogil@libero.it Date: Tue Jan 6 17:32:23 2015 +0100
update to 4.10.3
.gitignore | 1 + solr-get-poms.sh | 4 ++-- solr.spec | 12 ++++++++---- sources | 3 +-- 4 files changed, 12 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index b601eda..7dd1696 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /sorl-poms-4.10.1.tar.xz /solr-4.10.2-src.tgz /sorl-poms-4.10.2.tar.xz +/solr-poms-4.10.3.tar.xz diff --git a/solr-get-poms.sh b/solr-get-poms.sh index b5dc73c..64ec951 100644 --- a/solr-get-poms.sh +++ b/solr-get-poms.sh @@ -32,7 +32,7 @@ for p in common icu kuromoji morfologik phonetic \ popd done
-for p in core solrj test-framework webapp; do +for p in core solrj test-framework; do mkdir -p solr/${p} pushd solr/${p} wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-$%7Bp%7D/$%7BVERSION%7D... @@ -53,4 +53,4 @@ pushd solr/contrib/extraction popd
-tar cJf ../sorl-poms-${VERSION}.tar.xz * +tar cJf ../solr-poms-${VERSION}.tar.xz * diff --git a/solr.spec b/solr.spec index 3b4a2ff..f457b02 100644 --- a/solr.spec +++ b/solr.spec @@ -11,7 +11,7 @@ %bcond_with kite %endif Name: solr -Version: 4.10.2 +Version: 4.10.3 Release: 1%{?dist} Summary: Ultra-fast Lucene-based Search Server # MIT/X11 (BSD like) solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java @@ -20,7 +20,7 @@ URL: http://lucene.apache.org/solr/ Source0: http://www.apache.org/dist/lucene/solr/%%7Bversion%7D/%%7Bname%7D-%%7Bversio... # taken from http://central.maven.org/maven2/org/apache/solr and http://repo1.maven.org/maven2/org/apache/lucene/ # Use solr-get-poms.sh <VERSION> -Source1: sorl-poms-%{version}.tar.xz +Source1: solr-poms-%{version}.tar.xz Source2: solr-get-poms.sh
BuildRequires: mvn(com.cybozu.labs:langdetect) @@ -207,7 +207,8 @@ cp -p dev-tools/maven/lucene/pom.xml.template lucene/pom.xml cp -p dev-tools/maven/lucene/analysis/pom.xml.template lucene/analysis/pom.xml cp -p dev-tools/maven/solr/pom.xml.template solr/pom.xml cp -p dev-tools/maven/solr/contrib/pom.xml.template solr/contrib/pom.xml -sed -i "s/@version@/%{version}/g" lucene/pom.xml lucene/analysis/pom.xml solr/pom.xml solr/contrib/pom.xml +cp -p dev-tools/maven/solr/webapp/pom.xml.template solr/webapp/pom.xml +sed -i "s/@version@/%{version}/g" lucene/pom.xml lucene/analysis/pom.xml solr/pom.xml solr/contrib/pom.xml solr/webapp/pom.xml
# Fix parent pom sed -i "s|<relativePath>../../../pom.xml</relativePath>|<relativePath>../pom.xml</relativePath>|" $(find lucene -name "pom.xml") @@ -263,7 +264,7 @@ sed -i 's|<testSourceDirectory>${module-path}</testSourceDirectory>|<testSourceD for m in lucene lucene/core lucene/test-framework lucene/codecs \ lucene/analysis/stempel lucene/queryparser lucene/facet lucene/memory \ lucene/benchmark lucene/misc lucene/demo solr solr/core solr/solrj solr/test-framework \ - solr/contrib/extraction solr/contrib/velocity solr/contrib/uima solr/contrib/langid; do + solr/contrib/extraction solr/contrib/velocity solr/contrib/uima solr/contrib/langid solr/webapp; do
%pom_remove_plugin de.thetaphi:forbiddenapis ${m}
@@ -382,6 +383,9 @@ done %doc LICENSE.txt NOTICE.txt
%changelog +* Wed Dec 24 2014 gil cattaneo puntogil@libero.it 4.10.3-1 +- update to 4.10.3 + * Thu Oct 23 2014 gil cattaneo puntogil@libero.it 4.10.2-1 - update to 4.10.2
diff --git a/sources b/sources index cb98a7b..42e2667 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b67744ab88fc756d4e8dd2aa51643801 solr-4.10.2-src.tgz -fa0e09fa25554df6371a28906d537921 sorl-poms-4.10.2.tar.xz +192ccf8d46c47f84c2e3f2fe79df2304 solr-poms-4.10.3.tar.xz