[eclipse-dtp] Build with newer Lucene

[Andrew Overholt]

commit ae275e4b850e6b076601d23004d314d3cc01ebb3
Author: Andrew Overholt <overholt at redhat.com>
Date:   Mon Jul 11 12:49:16 2011 -0400

    Build with newer Lucene
    
    Add patches to both feature and MANIFEST.MF that specifically require
    Lucene < 2.0.

 eclipse-dtp-anyluceneinfeature.patch |   11 +++++++++++
 eclipse-dtp-uselucene29.patch        |   18 ++++++++++++++++++
 eclipse-dtp.spec                     |   15 ++++++++++++++-
 3 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-dtp-anyluceneinfeature.patch b/eclipse-dtp-anyluceneinfeature.patch
new file mode 100644
index 0000000..613d278
--- /dev/null
+++ b/eclipse-dtp-anyluceneinfeature.patch
@@ -0,0 +1,11 @@
+--- feature.xml	2011-07-11 12:21:01.531644004 -0400
++++ feature.xml	2011-07-11 12:21:15.053643564 -0400
+@@ -43,7 +43,7 @@
+          id="org.apache.lucene"
+          download-size="0"
+          install-size="0"
+-         version="1.9.1.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+ </feature>
diff --git a/eclipse-dtp-uselucene29.patch b/eclipse-dtp-uselucene29.patch
new file mode 100644
index 0000000..b9d30f1
--- /dev/null
+++ b/eclipse-dtp-uselucene29.patch
@@ -0,0 +1,18 @@
+### Eclipse Workspace Patch 1.0
+#P org.eclipse.datatools.sqltools.result
+Index: META-INF/MANIFEST.MF
+===================================================================
+RCS file: /cvsroot/datatools/org.eclipse.datatools.sqltools/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF,v
+retrieving revision 1.53
+diff -u -r1.53 MANIFEST.MF
+--- META-INF/MANIFEST.MF	20 Jan 2011 20:48:15 -0000	1.53
++++ META-INF/MANIFEST.MF	11 Jul 2011 15:58:01 -0000
+@@ -12,7 +12,7 @@
+  org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
+  com.ibm.icu;bundle-version="[3.4.0,5.0.0)",
+  org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+- org.apache.lucene;bundle-version="[1.9.0,2.0.0)"
++ org.apache.lucene;bundle-version="[1.9.0,3.0.0)"
+ Export-Package: org.eclipse.datatools.sqltools.result,
+  org.eclipse.datatools.sqltools.result.core,
+  org.eclipse.datatools.sqltools.result.export,
diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
index 94dffb2..c1a96c5 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dtp
 Version:   1.9.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -22,6 +22,10 @@ Patch0:    %{name}-java6.patch
 # connectivity feature)
 Patch1:    %{name}-remove-duplicate-plugin.patch
 
+# Build against newer Lucene
+Patch2:    %{name}-uselucene29.patch
+Patch3:    %{name}-anyluceneinfeature.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
@@ -63,6 +67,12 @@ pushd org.eclipse.datatools.connectivity.sqm.core
 %patch0
 popd
 %patch1
+pushd org.eclipse.datatools.sqltools.result
+%patch2
+popd
+pushd org.eclipse.datatools.sqldevtools.results.feature
+%patch3
+popd
 
 sed -i -e "s|2.9.0.qualifier|0.0.0|g" org.eclipse.datatools.enablement.oda.feature/feature.xml
 
@@ -140,6 +150,9 @@ rm -rf %{buildroot}
 %doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Mon Jul 11 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-2
+- Add patches to compile against newer lucene.
+
 * Wed Jul 6 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-1
 - Update to 1.9.0.