From 6d771c87dc66611576f9935a04cbbf9b28680663 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Jul 14 2016 16:37:10 +0000 Subject: analyzers-common should have versioned requires on package from core. --- diff --git a/lucene.spec b/lucene.spec index a227a5d..7af07c8 100644 --- a/lucene.spec +++ b/lucene.spec @@ -1,7 +1,7 @@ Summary: High-performance, full-featured text search engine Name: lucene Version: 5.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 License: ASL 2.0 URL: http://lucene.apache.org/ @@ -317,6 +317,16 @@ sed -i -e '1aRequire-Bundle: org.apache.lucene.core ' META-INF/MANIFEST.MF jar ufm lucene-misc-%{version}.jar META-INF/MANIFEST.MF 2>&1 > /dev/null popd +# analyzers-common needs versioned requires on package from core +# maven-bundle-plugin doesn't seem to recognize this case on F24 +%if 0%{?fedora} == 24 +pushd lucene/analysis/common/target +unzip lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF +sed -i -e 's/org.apache.lucene.analysis,/org.apache.lucene.analysis;version="[5.5,6)",/' META-INF/MANIFEST.MF +jar ufm lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF 2>&1 > /dev/null +popd +%endif + %install %mvn_install @@ -362,6 +372,9 @@ popd %license LICENSE.txt NOTICE.txt %changelog +* Wed Jul 13 2016 Roland Grunberg - 0:5.5.0-4 +- analyzers-common should have versioned requires on package from core. + * Fri Jul 08 2016 Mat Booth - 0:5.5.0-3 - Misc module should require core module, the split package causes problems for OSGi consumers