[eclipse-dtp] - Add ExclusiveArch for RHEL. - Use lucene.core instead of plain lucene.

[Andrew Overholt]

commit 5d7201ec37f74a970531872e6e5c5f5c4ce70df0
Author: Andrew Overholt <overholt at redhat.com>
Date:   Mon Nov 28 14:59:35 2011 -0500

    - Add ExclusiveArch for RHEL.
    - Use lucene.core instead of plain lucene.

 ...-anyluceneCoreinsqldevtoolsResultsfeature.patch |   15 +++++++++++++++
 eclipse-dtp-anyluceneinfeature.patch               |   11 -----------
 ....patch => eclipse-dtp-useluceneCoreUpTo30.patch |    2 +-
 eclipse-dtp.spec                                   |   13 ++++++++++---
 4 files changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch b/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch
new file mode 100644
index 0000000..0ceeaa2
--- /dev/null
+++ b/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch
@@ -0,0 +1,15 @@
+--- feature.xml	2011-11-28 14:35:02.240264597 -0500
++++ feature.xml	2011-11-28 14:35:12.905264218 -0500
+@@ -40,10 +40,10 @@
+          unpack="false"/>
+ 
+     <plugin
+-         id="org.apache.lucene"
++         id="org.apache.lucene.core"
+          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-useluceneCoreUpTo30.patch
similarity index 93%
rename from eclipse-dtp-uselucene29.patch
rename to eclipse-dtp-useluceneCoreUpTo30.patch
index b9d30f1..62a117c 100644
--- a/eclipse-dtp-uselucene29.patch
+++ b/eclipse-dtp-useluceneCoreUpTo30.patch
@@ -12,7 +12,7 @@ diff -u -r1.53 MANIFEST.MF
   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)"
++ org.apache.lucene.core;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 c1a96c5..606191c 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -3,7 +3,7 @@
 
 Name:      eclipse-dtp
 Version:   1.9.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Eclipse Data Tools Platform
 Group:     System Environment/Libraries
 License:   EPL
@@ -23,11 +23,14 @@ Patch0:    %{name}-java6.patch
 Patch1:    %{name}-remove-duplicate-plugin.patch
 
 # Build against newer Lucene
-Patch2:    %{name}-uselucene29.patch
-Patch3:    %{name}-anyluceneinfeature.patch
+Patch2:    %{name}-useluceneCoreUpTo30.patch
+Patch3:    %{name}-anyluceneCoreinsqldevtoolsResultsfeature.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?rhel} >= 6
+ExclusiveArch: %{ix86} x86_64
+%endif 
 BuildArch:        noarch
 
 BuildRequires:    java-devel 
@@ -150,6 +153,10 @@ rm -rf %{buildroot}
 %doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
 
 %changelog
+* Mon Nov 28 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-3
+- Add ExclusiveArch for RHEL.
+- Use lucene.core instead of plain lucene.
+
 * Mon Jul 11 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-2
 - Add patches to compile against newer lucene.