commit 69e8bdcf5177b44bbed3915a3361351695495c4b Author: gil puntogil@libero.it Date: Fri Feb 6 13:45:15 2015 +0100
introduce license macro
solr.spec | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) --- diff --git a/solr.spec b/solr.spec index cacd6d7..1572f3b 100644 --- a/solr.spec +++ b/solr.spec @@ -109,7 +109,6 @@ 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) -# https://bugzilla.redhat.com/show_bug.cgi?id=1087895 BuildRequires: mvn(net.sourceforge.argparse4j:argparse4j) # ... work in progress ... circular deps # https://bugzilla.redhat.com/show_bug.cgi?id=1179355 @@ -119,11 +118,12 @@ BuildRequires: mvn(org.kitesdk:kite-morphlines-hadoop-sequencefile) BuildRequires: mvn(org.kitesdk:kite-morphlines-json) BuildRequires: mvn(org.kitesdk:kite-morphlines-tika-core) BuildRequires: mvn(org.kitesdk:kite-morphlines-tika-decompress) +BuildRequires: mvn(org.kitesdk:kite-morphlines-twitter) +%if 0 # NOT available https://bugzilla.redhat.com/show_bug.cgi?id=1076620 BuildRequires: mvn(net.sf.saxon:Saxon-HE:9.5.1-4) BuildRequires: mvn(org.kitesdk:kite-morphlines-saxon) - -BuildRequires: mvn(org.kitesdk:kite-morphlines-twitter) +%endif %endif
BuildRequires: mvn(org.apache.lucene:lucene-analyzers-common) @@ -225,7 +225,8 @@ for p in lucene/test-framework/pom.xml lucene/analysis/common/pom.xml \ lucene/misc/pom.xml lucene/replicator/pom.xml lucene/spatial/pom.xml \ lucene/suggest/pom.xml lucene/expressions/pom.xml solr/test-framework/pom.xml solr/contrib/analysis-extras/pom.xml \ solr/contrib/clustering/pom.xml solr/contrib/dataimporthandler/pom.xml solr/contrib/dataimporthandler-extras/pom.xml \ - solr/contrib/extraction/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml solr/contrib/velocity/pom.xml; do + solr/contrib/extraction/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml solr/contrib/velocity/pom.xml \ + solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml; do sed -i 's|<sourceDirectory>${module-path}/src/java</sourceDirectory>|<sourceDirectory>${basedir}/src/java</sourceDirectory>|' ${p} sed -i 's|<testSourceDirectory>${module-path}/src/test</testSourceDirectory>|<testSourceDirectory>${basedir}/src/test</testSourceDirectory>|' ${p} done @@ -235,7 +236,8 @@ sed -i 's|<directory>${module-path}/src/resources</directory>|<directory>${based lucene/analysis/kuromoji/pom.xml lucene/analysis/morfologik/pom.xml lucene/analysis/phonetic/pom.xml \ lucene/analysis/smartcn/pom.xml lucene/analysis/stempel/pom.xml lucene/analysis/uima/pom.xml lucene/demo/pom.xml \ lucene/classification/pom.xml lucene/queryparser/pom.xml lucene/expressions/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml \ - solr/contrib/clustering/pom.xml + solr/contrib/clustering/pom.xml \ + solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml
sed -i 's|<directory>${module-path}/../resources</directory>|<directory>${basedir}/src/resources</directory>|' \ lucene/codecs/pom.xml lucene/core/pom.xml @@ -243,7 +245,8 @@ sed -i 's|<directory>${module-path}/../resources</directory>|<directory>${basedi sed -i 's|<directory>${module-path}/src/test-files</directory>|<directory>${basedir}/src/test-files</directory>|' \ lucene/analysis/uima/pom.xml lucene/spatial/pom.xml solr/contrib/langid/pom.xml solr/contrib/uima/pom.xml \ solr/contrib/clustering/pom.xml solr/contrib/extraction/pom.xml solr/contrib/velocity/pom.xml \ - solr/contrib/analysis-extras/pom.xml solr/contrib/dataimporthandler/pom.xml solr/contrib/dataimporthandler-extras/pom.xml + solr/contrib/analysis-extras/pom.xml solr/contrib/dataimporthandler/pom.xml solr/contrib/dataimporthandler-extras/pom.xml \ + solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml
sed -i 's|<directory>${module-path}</directory>|<directory>${basedir}</directory>|' \ lucene/benchmark/pom.xml @@ -259,7 +262,8 @@ 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 solr/webapp; do + solr/contrib/extraction solr/contrib/velocity solr/contrib/uima solr/contrib/langid solr/webapp \ + solr/contrib/morphlines-core/pom.xml solr/contrib/morphlines-cell/pom.xml solr/contrib/map-reduce/pom.xml; do
%pom_remove_plugin de.thetaphi:forbiddenapis ${m}
@@ -314,6 +318,10 @@ done %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/extraction %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/uima %pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/velocity +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/morphlines-core +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/morphlines-cell +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/map-reduce + # Use system jvm apis #%%pom_remove_dep javax.activation:activation solr/contrib/dataimporthandler %pom_remove_dep javax.activation:activation solr/contrib/dataimporthandler-extras @@ -334,6 +342,20 @@ done %pom_remove_dep org.bouncycastle:bcprov-jdk15 solr/contrib/dataimporthandler-extras %pom_remove_dep org.bouncycastle:bcprov-jdk15 solr/contrib/extraction %pom_remove_dep org.bouncycastle:bcprov-jdk15 solr/contrib/langid +%pom_remove_dep org.bouncycastle: solr/contrib/morphlines-core +%pom_remove_dep com.drewnoakes:metadata-extractor solr/contrib/morphlines-core +%pom_remove_dep com.googlecode.mp4parser:isoparser solr/contrib/morphlines-core +%pom_remove_dep org.bouncycastle: solr/contrib/morphlines-cell +%pom_remove_dep com.drewnoakes:metadata-extractor solr/contrib/morphlines-cell +%pom_remove_dep com.googlecode.mp4parser:isoparser solr/contrib/morphlines-cell +%pom_remove_dep org.bouncycastle: solr/contrib/map-reduce +%pom_remove_dep com.drewnoakes:metadata-extractor solr/contrib/map-reduce +%pom_remove_dep com.googlecode.mp4parser:isoparser solr/contrib/map-reduce +%pom_remove_dep net.sf.saxon:Saxon-HE solr/contrib/map-reduce +%pom_remove_dep org.kitesdk:kite-morphlines-saxon solr/contrib/map-reduce +%pom_remove_dep org.apache.tika:tika-xmp solr/contrib/map-reduce +%pom_remove_dep org.apache.tika:tika-xmp solr/contrib/morphlines-cell +%pom_remove_dep org.apache.tika:tika-xmp solr/contrib/morphlines-core
%if %{?fedora} > 20 %pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:groupId = 'io.netty']/pom:version" 3 @@ -360,7 +382,10 @@ for p in solr/core \ solr/contrib/extraction \ solr/contrib/langid \ solr/contrib/uima \ - solr/contrib/velocity;do + solr/contrib/velocity \ + solr/contrib/morphlines-core \ + solr/contrib/morphlines-cell \ + solr/contrib/map-reduce;do %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']" "<version>1.2.17</version>" ${p} done
@@ -374,10 +399,11 @@ done
%files -f .mfiles %dir %{_javadir}/%{name} -%doc solr/CHANGES.txt LICENSE.txt NOTICE.txt README.txt +%doc solr/CHANGES.txt README.txt +%license LICENSE.txt NOTICE.txt
%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt
%changelog * Wed Dec 24 2014 gil cattaneo puntogil@libero.it 4.10.3-1
java-sig-commits@lists.fedoraproject.org