[eclipse-phpeclipse] Patch out a reference to an internal Eclipse class that was causing a build failure on Eclipse 3.6+

[mbooth]

commit 7cdf337621c2849559bccbf891f2ccc74c0b25e5
Author: mbooth <fedora at matbooth.co.uk>
Date:   Sat Sep 25 14:23:57 2010 +0100

    Patch out a reference to an internal Eclipse class that was causing a build failure on Eclipse 3.6+

 ...se-phpeclipse-remove-internal-eclipse-ref.patch |   12 +++++++
 eclipse-phpeclipse.spec                            |   35 ++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-phpeclipse-remove-internal-eclipse-ref.patch b/eclipse-phpeclipse-remove-internal-eclipse-ref.patch
new file mode 100644
index 0000000..907ae28
--- /dev/null
+++ b/eclipse-phpeclipse-remove-internal-eclipse-ref.patch
@@ -0,0 +1,12 @@
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/model/VariableContextManager.java
+===================================================================
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/model/VariableContextManager.java
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/internal/model/VariableContextManager.java
+@@ -27,7 +27,6 @@
+ import org.eclipse.ui.IWorkbenchPart;
+ import org.eclipse.ui.IWorkbenchWindow;
+ import org.eclipse.ui.PlatformUI;
+-import org.eclipse.ui.externaltools.internal.model.ExternalToolBuilder;
+ 
+ /**
+  * Maintains the context used to expand variables. The context is based on the
diff --git a/eclipse-phpeclipse.spec b/eclipse-phpeclipse.spec
index ae7875a..699cdae 100644
--- a/eclipse-phpeclipse.spec
+++ b/eclipse-phpeclipse.spec
@@ -11,14 +11,30 @@ URL:       http://phpeclipse.net/
 
 Source0:   http://downloads.sourceforge.net/project/phpeclipse/a%29%20Eclipse%203.3.x/PHPEclipse-1.2.3/PHPEclipse-1.2.3.200910091456PRD-src.zip
 
+# Fix broken PHP table of contents links in the Eclipse help
 Patch0:    %{name}-broken-help-links.patch
+
+# Don't package hidden eclipse project files
 Patch1:    %{name}-fix-build-props.patch
+
+# Integrate properly with Fedora's apache (probably does not want to go upstream)
 Patch2:    %{name}-httpd-integration.patch
+
+# Remove Windows specific preferences (probably does not want to go upstream)
 Patch4:    %{name}-rm-win32-help.patch
+
+# Fix a bug that passed the wrong file location to the external parser
 Patch5:    %{name}-external-parser.patch
+
+# Fix a bug that passed in the wrong URL to the browser
 Patch6:    %{name}-external-preview.patch
+
+# Fix an exception that was causing the phpmanual not to show when you first open the PHP perspective
 Patch7:    %{name}-fix-phpmanual-view.patch
 
+# Remove a reference that was causing a build failure on Eclipse 3.6+
+Patch8:    %{name}-remove-internal-eclipse-ref.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:        noarch
@@ -44,13 +60,14 @@ templates and support for the XDebug and DBG debuggers.
 %setup -q -c
 
 # apply patches
-%patch0 
-%patch1 
-%patch2 
-%patch4 
-%patch5 
-%patch6 
-%patch7 
+%patch0 -p0 -b .orig
+%patch1 -p0 -b .orig
+%patch2 -p0 -b .orig
+%patch4 -p0 -b .orig
+%patch5 -p0 -b .orig
+%patch6 -p0 -b .orig
+%patch7 -p0 -b .orig
+%patch8 -p0 -b .orig
 
 #remove bundled jars
 find -name '*.class' -exec rm -f '{}' \;
@@ -97,6 +114,10 @@ rm -rf %{buildroot}
 %{eclipse_dropin}/phpeclipse-xdebug
 
 %changelog
+* Sat Sep 25 2010 Mat Booth <fedora at matbooth.co.uk> 1.2.3-2
+- Patch out a reference to an internal Eclipse class that was causing a build
+  failure on Eclipse 3.6+
+
 * Tue Jan 26 2010 Alexander Kurtakov <akurtako at redhat.com> 1.2.3-1
 - Update to 1.2.3 release.
 - Use upstream tarball.