diff --git a/lucene.spec b/lucene.spec index 4870dc1..1179b78 100644 --- a/lucene.spec +++ b/lucene.spec @@ -3,7 +3,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 7.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -311,7 +311,7 @@ popd mv lucene/build/poms/pom.xml . -# deal with split packages in core/misc modules by adding additional metadata and +# deal with split packages in core/misc/analysis modules by adding additional metadata and # require-bundling the core bundle from misc %pom_xpath_set "pom:Export-Package" "*;version=\"%{version}\"" %pom_add_plugin org.apache.felix:maven-bundle-plugin lucene/misc \ @@ -325,6 +325,13 @@ mv lucene/build/poms/pom.xml . org.apache.lucene.util.fst;version=\"%{version}\";misc=split;mandatory:=misc, *;version=\"%{version}\" " +%pom_add_plugin org.apache.felix:maven-bundle-plugin lucene/analysis/common \ +" +org.apache.lucene.core;bundle-version=\"%{version}\" + + org.apache.lucene.analysis.standard;version=\"%{version}\";analysis=split;mandatory:=analysis, + *;version=\"%{version}\" +" %pom_disable_module solr %pom_remove_plugin -r :gmaven-plugin @@ -360,7 +367,6 @@ popd %mvn_package :lucene-solr-grandparent __noinstall %endif - # For some reason TestHtmlParser.testTurkish fails when building inside SCLs %mvn_build -s -f @@ -413,6 +419,9 @@ popd %license lucene/LICENSE.txt lucene/NOTICE.txt %changelog +* Thu Apr 26 2018 Mat Booth - 0:7.1.0-2 +- Fix split package information in OSGi metadata + * Thu Apr 12 2018 Mat Booth - 0:7.1.0-1 - Update to a newer upstream release