rpms/lucene/devel lucene-2.4.1-Xmax.patch, NONE, 1.1 lucene-2.4.1-db-javadoc.patch, NONE, 1.1 lucene-2.4.1-fixmanifests.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 lucene.spec, 1.42, 1.43 sources, 1.5, 1.6 lucene-2.3.0-db-javadoc.patch, 1.1, NONE lucene-2.3.1-fixmanifests.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Tue Dec 1 16:07:27 UTC 2009


Author: orion

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

Modified Files:
	.cvsignore lucene.spec sources 
Added Files:
	lucene-2.4.1-Xmax.patch lucene-2.4.1-db-javadoc.patch 
	lucene-2.4.1-fixmanifests.patch 
Removed Files:
	lucene-2.3.0-db-javadoc.patch lucene-2.3.1-fixmanifests.patch 
Log Message:
* Tue Dec  1 2009 Orion Poplawski <orion at cora.nwra.com> - 0:2.4.1-1
- Update to 2.4.1


lucene-2.4.1-Xmax.patch:
 common-build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE lucene-2.4.1-Xmax.patch ---
--- lucene-2.4.1/common-build.xml.Xmax	2009-10-16 11:40:25.093879193 -0600
+++ lucene-2.4.1/common-build.xml	2009-10-16 11:44:34.401817699 -0600
@@ -480,8 +480,6 @@
         source="${javac.source}"
         target="${javac.target}">
         <nested/>
-        <compilerarg line="-Xmaxwarns 10000000"/>
-        <compilerarg line="-Xmaxerrs 10000000"/>
       </javac>
     </sequential>
   </macrodef>

lucene-2.4.1-db-javadoc.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE lucene-2.4.1-db-javadoc.patch ---
--- lucene-2.4.1/build.xml.db-javadoc	2009-03-02 10:11:17.000000000 -0700
+++ lucene-2.4.1/build.xml	2009-10-16 11:49:42.745817428 -0600
@@ -239,8 +239,8 @@
           <packageset dir="contrib/analyzers/src/java"/>
           <packageset dir="contrib/ant/src/java"/>
           <packageset dir="contrib/benchmark/src/java"/>
-          <packageset dir="contrib/db/bdb-je/src/java"/>
-          <packageset dir="contrib/db/bdb/src/java"/>
+          <!---<packageset dir="contrib/db/bdb-je/src/java"/> -->
+          <!---<packageset dir="contrib/db/bdb/src/java"/> -->
           <packageset dir="contrib/highlighter/src/java"/>
           <packageset dir="contrib/instantiated/src/java"/>
           <packageset dir="contrib/lucli/src/java"/>

lucene-2.4.1-fixmanifests.patch:
 common-build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lucene-2.4.1-fixmanifests.patch ---
--- lucene-2.4.1/common-build.xml.fixmanifests	2009-03-02 10:11:17.000000000 -0700
+++ lucene-2.4.1/common-build.xml	2009-10-16 11:39:18.387815444 -0600
@@ -281,7 +281,7 @@
 		<attribute name="Implementation-Title" value="org.apache.lucene"/>
 		<!-- impl version can be any string -->
 		<attribute name="Implementation-Version"
-		           value="${version} ${svnversion} - ${DSTAMP} ${TSTAMP}"/>
+		           value="${version} - ${DSTAMP} ${TSTAMP}"/>
 		<attribute name="Implementation-Vendor"
 		           value="The Apache Software Foundation"/>
 		<attribute name="X-Compile-Source-JDK" 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	5 May 2008 08:21:13 -0000	1.5
+++ .cvsignore	1 Dec 2009 16:07:26 -0000	1.6
@@ -1 +1 @@
-lucene-2.3.1-src.tar.gz
+lucene-2.4.1-src.tar.gz


Index: lucene.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/lucene.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- lucene.spec	25 Jul 2009 11:26:19 -0000	1.42
+++ lucene.spec	1 Dec 2009 16:07:26 -0000	1.43
@@ -35,17 +35,19 @@
 
 Summary:        High-performance, full-featured text search engine
 Name:           lucene
-Version:        2.3.1
-Release:        5.5%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://lucene.apache.org/
 Group:          Internet/WWW/Indexing/Search
-Source0:        http://www.apache.org/dist/lucene/java/%{name}-%{version}-src.tar.gz
+Source0:        http://archive.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
-Patch1:         lucene-2.3.0-db-javadoc.patch
-Patch2:         %{name}-%{version}-fixmanifests.patch
+Patch1:         lucene-2.4.1-db-javadoc.patch
+Patch2:         %{name}-2.4.1-fixmanifests.patch
+# Remove -Xmaxwarns, -Xmaxerrs that gcj does not support
+Patch3:         %{name}-2.4.1-Xmax.patch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
@@ -116,6 +118,7 @@ find . -name "*.jar" -exec rm -f {} \;
 
 %patch1 -p1 -b .db-javadoc
 %patch2 -p1 -b .fixmanifests
+%patch3 -p1 -b .Xmax
 
 %build
 mkdir -p docs
@@ -243,7 +246,6 @@ fi
 %{_libdir}/gcj/%{name}/lucene-ant-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-highlighter-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-lucli-%{version}.jar.*
-%{_libdir}/gcj/%{name}/lucene-memory-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-misc-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-queries-%{version}.jar.*
 %{_libdir}/gcj/%{name}/lucene-snowball-%{version}.jar.*
@@ -272,6 +274,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Orion Poplawski <orion at cora.nwra.com> - 0:2.4.1-1
+- Update to 2.4.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.3.1-5.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lucene/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	5 May 2008 08:21:13 -0000	1.5
+++ sources	1 Dec 2009 16:07:26 -0000	1.6
@@ -1 +1 @@
-ad034c84f85dbbf383b26d85fe697bbf  lucene-2.3.1-src.tar.gz
+ad46595439240e10387fcbf7647705db  lucene-2.4.1-src.tar.gz


--- lucene-2.3.0-db-javadoc.patch DELETED ---


--- lucene-2.3.1-fixmanifests.patch DELETED ---




More information about the fedora-extras-commits mailing list