[lucene] Improve OSGi metadata.

[Alexander Kurtakov]

commit c93d403987b9776dde94b518f5819644f96fac07
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Mar 12 19:24:25 2014 +0200

    Improve OSGi metadata.
    
    - Add queryparser osgi metadata properly.
    - Export lucene.analysys.standard too.

 lucene-4.7.0-analysis-OSGi-MANIFEST.MF    |    1 +
 lucene-4.7.0-core-OSGi-MANIFEST.MF        |    2 -
 lucene-4.7.0-queryparser-OSGi-MANIFEST.MF |   31 +++++++++++++++++++++++++++++
 lucene.spec                               |   12 ++++++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/lucene-4.7.0-analysis-OSGi-MANIFEST.MF b/lucene-4.7.0-analysis-OSGi-MANIFEST.MF
index efa1952..ee2b9ab 100644
--- a/lucene-4.7.0-analysis-OSGi-MANIFEST.MF
+++ b/lucene-4.7.0-analysis-OSGi-MANIFEST.MF
@@ -45,6 +45,7 @@ Export-Package: org.apache.lucene.analysis.ar;version="4.7.0",
  org.apache.lucene.analysis.shingle;version="4.7.0",
  org.apache.lucene.analysis.sinks;version="4.7.0",
  org.apache.lucene.analysis.snowball;version="4.7.0",
+ org.apache.lucene.analysis.standard;version="4.7.0",
  org.apache.lucene.analysis.sv;version="4.7.0",
  org.apache.lucene.analysis.synonym;version="4.7.0",
  org.apache.lucene.analysis.th;version="4.7.0",
diff --git a/lucene-4.7.0-core-OSGi-MANIFEST.MF b/lucene-4.7.0-core-OSGi-MANIFEST.MF
index 6fdcf7c..cb0ed48 100644
--- a/lucene-4.7.0-core-OSGi-MANIFEST.MF
+++ b/lucene-4.7.0-core-OSGi-MANIFEST.MF
@@ -7,8 +7,6 @@ Export-Package: org.apache.lucene;version="4.7.0",
  org.apache.lucene.analysis.tokenattributes;version="4.7.0",
  org.apache.lucene.document;version="4.7.0",
  org.apache.lucene.index;version="4.7.0",
- org.apache.lucene.queryParser;version="4.7.0",
- org.apache.lucene.queryParser.classic;version="4.7.0",
  org.apache.lucene.search;version="4.7.0",
  org.apache.lucene.search.payloads;version="4.7.0",
  org.apache.lucene.search.spans;version="4.7.0",
diff --git a/lucene-4.7.0-queryparser-OSGi-MANIFEST.MF b/lucene-4.7.0-queryparser-OSGi-MANIFEST.MF
new file mode 100644
index 0000000..9dc31d5
--- /dev/null
+++ b/lucene-4.7.0-queryparser-OSGi-MANIFEST.MF
@@ -0,0 +1,31 @@
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.apache.lucene.queryparser
+Require-Bundle: org.apache.lucene.core;bundle-version="4.7.0"
+Export-Package: org.apache.lucene.analysis.ar;version="4.7.0",
+ org.apache.lucene.queryparser.analyzing;version="4.7.0",
+ org.apache.lucene.queryparser.classic;version="4.7.0",
+ org.apache.lucene.queryparser.complexPhrase;version="4.7.0",
+ org.apache.lucene.queryparser.ext;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.builders;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.config;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.messages;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.nodes;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.parser;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.processors;version="4.7.0",
+ org.apache.lucene.queryparser.flexible.core.util;version="4.7.0",
+ org.apache.lucene.queryparser.simple;version="4.7.0",
+ org.apache.lucene.queryparser.surround.parser;version="4.7.0",
+ org.apache.lucene.queryparser.surround.query;version="4.7.0",
+ org.apache.lucene.queryparser.xml;version="4.7.0",
+ org.apache.lucene.queryparser.xml.builders;version="4.7.0"
+Bundle-Version: 4.7.0
+Bundle-Vendor: fedoraproject.org
+Bundle-Name: Lucene Query parsers and parsing framework
+Import-Package: org.xml.sax;resolution:=optional,
+ javax.xml.parsers;resolution:=optional,
+ org.xml.sax.helpers;resolution:=optional
+Bundle-ManifestVersion: 2
+
+
diff --git a/lucene.spec b/lucene.spec
index 9571cae..0f5ddae 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -33,13 +33,14 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        4.7.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
 Source0:        http://www.apache.org/dist/lucene/java/%{version}/%{name}-%{version}-src.tgz
 Source1:        lucene-%{version}-core-OSGi-MANIFEST.MF
 Source2:        lucene-%{version}-analysis-OSGi-MANIFEST.MF
+Source3:        lucene-%{version}-queryparser-OSGi-MANIFEST.MF
 
 Patch0:         0001-disable-ivy-settings.patch
 # upstream randomizedtesting bundles it's deps
@@ -144,6 +145,11 @@ cat %{SOURCE2} >> META-INF/MANIFEST.MF
 sed -i '/^\r$/d' META-INF/MANIFEST.MF
 zip -u build/analysis/common/lucene-analyzers-common-%{version}.jar META-INF/MANIFEST.MF
 
+unzip -o build/queryparser/lucene-queryparser-%{version}.jar META-INF/MANIFEST.MF
+cat %{SOURCE3} >> META-INF/MANIFEST.MF
+sed -i '/^\r$/d' META-INF/MANIFEST.MF
+zip -u build/queryparser/lucene-queryparser-%{version}.jar META-INF/MANIFEST.MF
+
 %install
 for module in core benchmark classification codecs demo expressions facet    \
 grouping highlighter join memory misc queries queryparser replicator sandbox \
@@ -178,6 +184,10 @@ sed -i "/rawPom/{p;s//effectivePom/g}" .xmvn-reactor
 %doc LICENSE.txt
 
 %changelog
+* Wed Mar 12 2014 Alexander Kurtakov <akurtako at redhat.com> 0:4.7.0-5
+- Add queryparser osgi metadata properly.
+- Export lucene.analysys.standard too.
+
 * Wed Mar 12 2014 Alexander Kurtakov <akurtako at redhat.com> 0:4.7.0-4
 - Export queryParser and queryParser.classic packages for OSGi.