[lucene] Resolves: rhbz#615609 custom MANIFEST.MF in lucene drops Specification-Version

[Caolan McNamara]

commit 7a9809dc8cf2dca57b9b7d27374080076b5018df
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 1 08:59:26 2010 +0100

    Resolves: rhbz#615609 custom MANIFEST.MF in lucene drops Specification-Version

 lucene-1.9-OSGi-MANIFEST.MF          |    3 ---
 lucene-1.9-analysis-OSGi-MANIFEST.MF |    3 ---
 lucene.spec                          |   14 +++++++++++---
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/lucene-1.9-OSGi-MANIFEST.MF b/lucene-1.9-OSGi-MANIFEST.MF
index 56dacd4..949180d 100644
--- a/lucene-1.9-OSGi-MANIFEST.MF
+++ b/lucene-1.9-OSGi-MANIFEST.MF
@@ -1,6 +1,3 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 2.3 (IBM Corporation)
 Bundle-ManifestVersion: 2
 Export-Package: org.apache.lucene,org.apache.lucene.analysis,org.apach
  e.lucene.analysis.de,org.apache.lucene.analysis.standard,org.apache.l
diff --git a/lucene-1.9-analysis-OSGi-MANIFEST.MF b/lucene-1.9-analysis-OSGi-MANIFEST.MF
index ef4184b..a1bf84b 100644
--- a/lucene-1.9-analysis-OSGi-MANIFEST.MF
+++ b/lucene-1.9-analysis-OSGi-MANIFEST.MF
@@ -1,6 +1,3 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 2.3 (IBM Corporation)
 Bundle-ManifestVersion: 2
 Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analys
  is.cjk,org.apache.lucene.analysis.cn,org.apache.lucene.analysis.cz,or
diff --git a/lucene.spec b/lucene.spec
index 5e84318..fb182f6 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        2.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -55,6 +55,7 @@ BuildRequires:  jline
 BuildRequires:  jtidy
 BuildRequires:  regexp
 BuildRequires:  apache-commons-digester
+BuildRequires:  unzip
 Provides:       lucene-core = %{epoch}:%{version}-%{release}
 # previously used by eclipse but no longer needed
 Obsoletes:      lucene-devel < %{version}
@@ -128,10 +129,13 @@ ant -Dbuild.sysclasspath=first \
   package
 #  package test generate-test-reports
 
+# add missing OSGi metadata to manifests
 mkdir META-INF
-cp %{SOURCE1} META-INF/MANIFEST.MF
+unzip -o build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
+cat %{SOURCE1} >> META-INF/MANIFEST.MF
 zip -u build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
-cp %{SOURCE2} META-INF/MANIFEST.MF
+unzip -o build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
+cat %{SOURCE2} >> META-INF/MANIFEST.MF
 zip -u build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
 
 %install
@@ -196,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}-demos.jar
 
 %changelog
+* Fri Oct 01 2010 Caolán McNamara <caolanm at redhat.com> 0:2.4.1-4
+- Resolves: rhbz#615609 custom MANIFEST.MF in lucene drops
+  "Specification-Version"
+
 * Mon Jun 7 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-3
 - Fix build.
 - FIx various rpmlint warnings.