[lucene] remove empty lines from MANIFEST.MF

Caolan McNamara caolanm at fedoraproject.org
Fri Oct 1 10:55:21 UTC 2010


commit 4121323023c69c6b3f2f364a3fbb5a70718726ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 1 11:55:01 2010 +0100

    remove empty lines from MANIFEST.MF

 lucene-1.9-OSGi-MANIFEST.MF          |    1 -
 lucene-1.9-analysis-OSGi-MANIFEST.MF |    1 -
 lucene.spec                          |    7 ++++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/lucene-1.9-OSGi-MANIFEST.MF b/lucene-1.9-OSGi-MANIFEST.MF
index 949180d..673c89a 100644
--- a/lucene-1.9-OSGi-MANIFEST.MF
+++ b/lucene-1.9-OSGi-MANIFEST.MF
@@ -9,4 +9,3 @@ Bundle-SymbolicName: org.apache.lucene
 Bundle-Name: Apache Lucene
 Bundle-Localization: plugin
 Bundle-Vendor: Apache Software Foundation
-
diff --git a/lucene-1.9-analysis-OSGi-MANIFEST.MF b/lucene-1.9-analysis-OSGi-MANIFEST.MF
index a1bf84b..998803c 100644
--- a/lucene-1.9-analysis-OSGi-MANIFEST.MF
+++ b/lucene-1.9-analysis-OSGi-MANIFEST.MF
@@ -11,4 +11,3 @@ Bundle-SymbolicName: org.apache.lucene.analysis
 Bundle-Name: Apache Lucene Analysis
 Bundle-Localization: plugin
 Bundle-Vendor: Apache Software Foundation
-
diff --git a/lucene.spec b/lucene.spec
index fb182f6..2e9e20a 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:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -133,9 +133,11 @@ ant -Dbuild.sysclasspath=first \
 mkdir META-INF
 unzip -o build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
 cat %{SOURCE1} >> META-INF/MANIFEST.MF
+sed -i '/^\r$/d' META-INF/MANIFEST.MF
 zip -u build/lucene-core-%{version}.jar META-INF/MANIFEST.MF
 unzip -o build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
 cat %{SOURCE2} >> META-INF/MANIFEST.MF
+sed -i '/^\r$/d' META-INF/MANIFEST.MF
 zip -u build/contrib/analyzers/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
 
 %install
@@ -200,6 +202,9 @@ 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-5
+- remove empty lines from MANIFEST.MF
+
 * 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"


More information about the scm-commits mailing list