rpms/lucene/devel lucene-2.3.1-fixmanifests.patch, NONE, 1.1 lucene.spec, 1.40, 1.41

[Deepak Bhole]

Author: dbhole

Update of /cvs/extras/rpms/lucene/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8553

Modified Files:
	lucene.spec 
Added Files:
	lucene-2.3.1-fixmanifests.patch 
Log Message:

- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest



lucene-2.3.1-fixmanifests.patch:

--- NEW FILE lucene-2.3.1-fixmanifests.patch ---
diff -up ./common-build.xml.sav ./common-build.xml
--- ./common-build.xml.sav	2009-04-30 14:12:20.000000000 -0400
+++ ./common-build.xml	2009-04-30 14:12:26.000000000 -0400
@@ -277,7 +277,7 @@
 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
 		<!-- impl version can be any string -->
 		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/>
+		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
 		<attribute name="Implementation-Vendor"
 		           value="The Apache Software Foundation"/>
 		<attribute name="X-Compile-Source-JDK" 
diff -up ./contrib/lucli/build.xml.sav ./contrib/lucli/build.xml
--- ./contrib/lucli/build.xml.sav	2009-04-30 14:09:52.000000000 -0400
+++ ./contrib/lucli/build.xml	2009-04-30 14:10:11.000000000 -0400
@@ -42,7 +42,6 @@
     <jarify>
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
     </jarify>
    </target>
@@ -51,7 +50,6 @@
   	<jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
       <manifest-attributes>
         <attribute name="Main-Class" value="lucli.Lucli" />
-        <attribute name="Class-Path" value="lib/jline.jar lib/lucene.jar" />
       </manifest-attributes>
   	</jarify>
   </target>   


Index: lucene.spec
===================================================================
RCS file: /cvs/extras/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- lucene.spec	25 Feb 2009 22:08:03 -0000	1.40
+++ lucene.spec	30 Apr 2009 18:30:49 -0000	1.41
@@ -36,7 +36,7 @@
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
 Version:        2.3.1
-Release:        4.4%{?dist}
+Release:        4.5%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
@@ -44,7 +44,8 @@ Group:          Internet/WWW/Indexing/Se
 Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
 Source1:	lucene-1.9-OSGi-MANIFEST.MF
 Source2:	lucene-1.9-analysis-OSGi-MANIFEST.MF
-Patch4:         lucene-2.3.0-db-javadoc.patch
+Patch1:         lucene-2.3.0-db-javadoc.patch
+Patch2:         %{name}-%{version}-fixmanifests.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -113,7 +114,8 @@ Requires:       %{name} = %{epoch}:%{ver
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-%patch4 -p1 -b .db-javadoc
+%patch1 -p1 -b .db-javadoc
+%patch2 -p1 -b .fixmanifests
 
 %build
 mkdir -p docs
@@ -270,6 +272,9 @@ fi
 
 
 %changelog
+* Thu Apr 30 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.3.1-4.5
+- rhbz #465344: Fix Implementation-Version and remove Class-Path from manifest
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.1-4.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild