From 34f66db028eb10b438e8ef089fbd0901ef817988 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Dec 01 2009 16:07:26 +0000
Subject: - Update to 2.4.1


---

diff --git a/.cvsignore b/.cvsignore
index 23fbf2a..913dd60 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lucene-2.3.1-src.tar.gz
+lucene-2.4.1-src.tar.gz
diff --git a/lucene-2.3.0-db-javadoc.patch b/lucene-2.3.0-db-javadoc.patch
deleted file mode 100644
index 62b1eba..0000000
--- a/lucene-2.3.0-db-javadoc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Do not attempt to build documentation for db4 stuff,
-we removed it in %prep
-
-Lubomir Kundrak <lkundrak@redhat.com>
-
-diff -urp lucene-2.3.0.orig/build.xml lucene-2.3.0/build.xml
---- lucene-2.3.0.orig/build.xml	2008-01-21 02:29:41.000000000 +0100
-+++ lucene-2.3.0/build.xml	2008-02-19 16:52:14.000000000 +0100
-@@ -237,8 +237,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/lucli/src/java"/>
-           <packageset dir="contrib/memory/src/java"/>
diff --git a/lucene-2.3.1-fixmanifests.patch b/lucene-2.3.1-fixmanifests.patch
deleted file mode 100644
index 96bf332..0000000
--- a/lucene-2.3.1-fixmanifests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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>   
diff --git a/lucene-2.4.1-Xmax.patch b/lucene-2.4.1-Xmax.patch
new file mode 100644
index 0000000..1fe04cf
--- /dev/null
+++ b/lucene-2.4.1-Xmax.patch
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/lucene-2.4.1-db-javadoc.patch b/lucene-2.4.1-db-javadoc.patch
new file mode 100644
index 0000000..bcfde2f
--- /dev/null
+++ b/lucene-2.4.1-db-javadoc.patch
@@ -0,0 +1,13 @@
+--- 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"/>
diff --git a/lucene-2.4.1-fixmanifests.patch b/lucene-2.4.1-fixmanifests.patch
new file mode 100644
index 0000000..e1340aa
--- /dev/null
+++ b/lucene-2.4.1-fixmanifests.patch
@@ -0,0 +1,11 @@
+--- 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" 
diff --git a/lucene.spec b/lucene.spec
index 0590f5c..59a062a 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -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@cora.nwra.com> - 0:2.4.1-1
+- Update to 2.4.1
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.3.1-5.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 97a7b45..4a3c396 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad034c84f85dbbf383b26d85fe697bbf  lucene-2.3.1-src.tar.gz
+ad46595439240e10387fcbf7647705db  lucene-2.4.1-src.tar.gz