[eclipse/f16] - Update to 3.7.1. - Remove xpcom patch as it is applied in the build.

[Roland Grunberg]

commit f379acaa7b39fc5dea8379695fb5a3183d6a180a
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Nov 7 15:23:02 2011 -0500

    - Update to 3.7.1.
    - Remove xpcom patch as it is applied in the build.

 eclipse-xpcom-h.patch |   14 --------------
 eclipse.spec          |   34 +++++++++++-----------------------
 2 files changed, 11 insertions(+), 37 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 53840e0..ebf837a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -3,7 +3,7 @@ Epoch:  1
 %global eclipse_major   3
 %global eclipse_minor   7
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro   0
+%global eclipse_micro   1
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/
 
@@ -23,16 +23,12 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1.3%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz
-Source1:        %{download_url}eclipse-3.7.0-I20110613-1736-src.tar.bz2
-# Patch to allow xpcom.cpp to build under latest xulrunner which has removed
-# a particular API and a type it depends on so we don't want to compile that
-# API
-Patch1:         eclipse-xpcom-h.patch
+Source0:        %{download_url}eclipse-build-614be929a5476fc74ce0ed18c41ded2e2600f5d4.tar.xz
+Source1:        %{download_url}eclipse-3.7.1-src.tar.bz2
 
 BuildRequires:  ant
 BuildRequires:  rsync
@@ -165,15 +161,10 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5
+%setup -q -n eclipse-build-614be929a5476fc74ce0ed18c41ded2e2600f5d4
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
-pushd build/eclipse-3.7.0-I20110613-1736-src
-pushd plugins/org.eclipse.swt
-pushd Eclipse\ SWT\ Mozilla/common/library/
-%patch1
-popd
-popd
+pushd build/eclipse-3.7.1-src
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -325,7 +316,7 @@ fi
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %if %{initialize}
-%dir %{_libdir}/%{name}/libswt-*.so
+%{_libdir}/%{name}/libswt-*.so
 %dir %{_libdir}/%{name}/configuration
 %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi
 %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles
@@ -342,12 +333,6 @@ fi
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}/features
 %dir %{_datadir}/%{name}
-%if %{initialize}
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
-%endif
 %dir %{_libdir}/%{name}/configuration
 %config %{_libdir}/%{name}/configuration/config.ini
 %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
@@ -413,7 +398,6 @@ fi
 %{_libdir}/%{name}/plugins/org.apache.ant_*
 %{_libdir}/%{name}/plugins/org.apache.commons.el_*
 %{_libdir}/%{name}/plugins/org.apache.commons.logging_*
-%{_libdir}/%{name}/plugins/org.apache.lucene_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.core_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
@@ -556,6 +540,10 @@ fi
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Mon Nov 07 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-1
+- Update to 3.7.1.
+- Remove xpcom patch as it is applied in the build.
+
 * Mon Jun 27 2011 Chris Aniszczyk <zx at redhat.com> 1:3.7.0-1.3
 - Fix eclipse archive name