[solr] rebuilt with new jhighlight

gil gil at fedoraproject.org
Fri Mar 6 10:05:51 UTC 2015


commit 55e4dd760cef734d11938cca101d59dbef640907
Author: gil <puntogil at libero.it>
Date:   Fri Mar 6 11:05:24 2015 +0100

    rebuilt with new jhighlight

 solr.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/solr.spec b/solr.spec
index 3cfa898..bfff787 100644
--- a/solr.spec
+++ b/solr.spec
@@ -10,7 +10,7 @@
 %endif
 Name:          solr
 Version:       4.10.3
-Release:       1%{?dist}
+Release:       2%{?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
@@ -30,7 +30,7 @@ BuildRequires: mvn(com.ibm.icu:icu4j)
 BuildRequires: mvn(com.spatial4j:spatial4j)
 BuildRequires: mvn(com.sun.mail:gimap)
 BuildRequires: mvn(com.sun.mail:javax.mail)
-BuildRequires: mvn(com.uwyn:jhighlight)
+BuildRequires: mvn(org.codelibs:jhighlight)
 BuildRequires: mvn(commons-cli:commons-cli)
 BuildRequires: mvn(commons-codec:commons-codec)
 BuildRequires: mvn(commons-fileupload:commons-fileupload)
@@ -392,6 +392,14 @@ for p in solr/core \
 %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']" "<version>1.2.17</version>" ${p}
 done
 
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/dataimporthandler-extras
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/extraction
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/langid
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/map-reduce
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/morphlines-cell
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jhighlight']/pom:groupId" org.codelibs solr/contrib/morphlines-core
+
 %build
 
 # Test skipped for unavailable test deps {lucene,solr}/test-framework
@@ -409,6 +417,9 @@ done
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Mar 06 2015 gil cattaneo <puntogil at libero.it> 4.10.3-2
+- rebuilt with new jhighlight
+
 * Wed Dec 24 2014 gil cattaneo <puntogil at libero.it> 4.10.3-1
 - update to 4.10.3
 


More information about the scm-commits mailing list