[solr] update to 4.7.2
gil
gil at fedoraproject.org
Tue Apr 15 15:58:01 UTC 2014
commit 5a75295d85e44b08c86fba3698b550b249e449a5
Author: gil <puntogil at libero.it>
Date: Tue Apr 15 17:57:40 2014 +0200
update to 4.7.2
.gitignore | 2 +
solr-get-poms.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
solr.spec | 30 +++++++++++++++++-----------
sources | 4 +-
4 files changed, 78 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f06089a..c970f67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/solr-4.7.0-src.tgz
/sorl-poms-4.7.0.tar.xz
+/solr-4.7.2-src.tgz
+/sorl-poms-4.7.2.tar.xz
diff --git a/solr-get-poms.sh b/solr-get-poms.sh
new file mode 100644
index 0000000..b5dc73c
--- /dev/null
+++ b/solr-get-poms.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+ echo "Usage: ./create-sources VERSION"
+ exit 1
+fi
+
+VERSION=${1}
+rm -rf poms
+mkdir poms
+cd poms
+
+wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-solr-grandparent/${VERSION}/lucene-solr-grandparent-${VERSION}.pom
+
+mkdir lucene solr
+
+for p in benchmark classification codecs core demo expressions \
+ facet grouping highlighter join memory misc queries queryparser \
+ replicator sandbox spatial suggest test-framework; do
+ mkdir -p lucene/${p}
+ pushd lucene/${p}
+ wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-${p}/${VERSION}/lucene-${p}-${VERSION}.pom
+ popd
+done
+
+mkdir -p lucene/analysis
+for p in common icu kuromoji morfologik phonetic \
+ smartcn stempel uima; do
+ mkdir -p lucene/analysis/${p}
+ pushd lucene/analysis/${p}
+ wget -O pom.xml http://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-${p}/${VERSION}/lucene-analyzers-${p}-${VERSION}.pom
+ popd
+done
+
+for p in core solrj test-framework webapp; do
+ mkdir -p solr/${p}
+ pushd solr/${p}
+ wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom
+ popd
+done
+
+for p in analysis-extras clustering dataimporthandler dataimporthandler-extras \
+ langid map-reduce morphlines-cell morphlines-core uima velocity; do
+ mkdir -p solr/contrib/${p}
+ pushd solr/contrib/${p}
+ wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-${p}/${VERSION}/solr-${p}-${VERSION}.pom
+ popd
+done
+
+mkdir -p solr/contrib/extraction
+pushd solr/contrib/extraction
+ wget -O pom.xml http://central.maven.org/maven2/org/apache/solr/solr-cell/${VERSION}/solr-cell-${VERSION}.pom
+popd
+
+
+tar cJf ../sorl-poms-${VERSION}.tar.xz *
diff --git a/solr.spec b/solr.spec
index 9c7162e..d534c0b 100644
--- a/solr.spec
+++ b/solr.spec
@@ -11,15 +11,17 @@
%bcond_with kite
%endif
Name: solr
-Version: 4.7.0
-Release: 3%{?dist}
+Version: 4.7.2
+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
License: ASL 2.0 and BSD
URL: http://lucene.apache.org/solr/
Source0: http://www.apache.org/dist/lucene/solr/%{version}/%{name}-%{version}-src.tgz
# taken from http://central.maven.org/maven2/org/apache/solr and http://repo1.maven.org/maven2/org/apache/lucene/
+# Use sorl-get-poms.sh <VERSION>
Source1: sorl-poms-%{version}.tar.xz
+Source2: solr-get-poms.sh
BuildRequires: java-devel
@@ -115,9 +117,9 @@ BuildRequires: mvn(com.codahale.metrics:metrics-core)
BuildRequires: mvn(com.codahale.metrics:metrics-healthchecks)
BuildRequires: mvn(com.typesafe:config)
BuildRequires: mvn(org.apache.hadoop:hadoop-mapreduce-client-core)
-# http://gil.fedorapeople.org/argparse4j-0.4.3-1.fc19.src.rpm
+# https://bugzilla.redhat.com/show_bug.cgi?id=1087895
BuildRequires: mvn(net.sourceforge.argparse4j:argparse4j)
-# NOT available
+# NOT available https://bugzilla.redhat.com/show_bug.cgi?id=1076620
BuildRequires: mvn(net.sf.saxon:Saxon-HE:9.5.1-4)
# ... work in progress ... circular deps
BuildRequires: mvn(org.kitesdk:kite-morphlines-avro)
@@ -137,8 +139,9 @@ BuildRequires: mvn(org.apache.lucene:lucene-analyzers-morfologik)
BuildRequires: mvn(org.apache.lucene:lucene-analyzers-phonetic)
BuildRequires: mvn(org.apache.lucene:lucene-analyzers-smartcn)
BuildRequires: mvn(org.apache.lucene:lucene-analyzers-stempel)
+BuildRequires: mvn(org.apache.lucene:lucene-analyzers-uima)
BuildRequires: mvn(org.apache.lucene:lucene-codecs)
-BuildRequires: mvn(org.apache.lucene:lucene-core) >= %{version}
+BuildRequires: mvn(org.apache.lucene:lucene-core)
BuildRequires: mvn(org.apache.lucene:lucene-expressions)
BuildRequires: mvn(org.apache.lucene:lucene-grouping)
BuildRequires: mvn(org.apache.lucene:lucene-highlighter)
@@ -151,14 +154,7 @@ BuildRequires: mvn(org.apache.lucene:lucene-replicator)
BuildRequires: mvn(org.apache.lucene:lucene-spatial)
BuildRequires: mvn(org.apache.lucene:lucene-suggest)
-#BuildRequires: mvn(org.apache.lucene:lucene-benchmark)
-#BuildRequires: mvn(org.apache.lucene:lucene-classification)
-#BuildRequires: mvn(org.apache.lucene:lucene-demo)
-#BuildRequires: mvn(org.apache.lucene:lucene-facet)
-#BuildRequires: mvn(org.apache.lucene:lucene-sandbox)
-
BuildRequires: mvn(org.apache.lucene:lucene-analysis-modules-aggregator)
-# DO NOT USE this pom solr module is disabled BuildRequires: mvn(org.apache.lucene:lucene-solr-grandparent)
BuildRequires: mvn(org.apache.lucene:lucene-parent)
%if 0
@@ -207,6 +203,13 @@ find . -name "*.jar" -print -delete
find . -name "*.js" -print -delete
tar -xf %{SOURCE1}
+
+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
+
# Fix parent pom
sed -i "s|<relativePath>../../../pom.xml</relativePath>|<relativePath>../pom.xml</relativePath>|" $(find lucene -name "pom.xml")
sed -i "s|<relativePath>../../../pom.xml</relativePath>|<relativePath>../pom.xml</relativePath>|" $(find solr -name "pom.xml")
@@ -366,6 +369,9 @@ rm -r solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.j
%doc LICENSE.txt NOTICE.txt
%changelog
+* Tue Apr 15 2014 gil cattaneo <puntogil at libero.it> 4.7.2-1
+- update to 4.7.2
+
* Tue Mar 18 2014 gil cattaneo <puntogil at libero.it> 4.7.0-3
- fix BR list
diff --git a/sources b/sources
index 881b7ad..10d93a8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c2bb70ec42d2e2779cd5d77d8b87bff7 solr-4.7.0-src.tgz
-697222bce296132f7a861b046051689d sorl-poms-4.7.0.tar.xz
+ca960f3714f968f84d4ccf29ac996c04 solr-4.7.2-src.tgz
+5ba576dea0dd3d9ff4ce7f9ac825e812 sorl-poms-4.7.2.tar.xz
More information about the scm-commits
mailing list