From 518aafdf7c93d944683a1aa148d1e2da5dd97432 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: May 02 2005 21:22:29 +0000
Subject: - Replace temporary patch to debug.ui with upstream patch to swt

    (rh#155853).

---

diff --git a/eclipse.spec b/eclipse.spec
index fcb1c11..0f9451b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,7 +23,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        0.M6.13
+Release:        0.M6.14
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -88,7 +88,8 @@ Patch22: 	%{name}-updatehomedir.patch
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=82988
 Patch23:	%{name}-importArchivedProj.patch
 #https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=155853
-Patch24: 	%{name}-NPE-debug.ui.patch
+#FIXME: should be removed for 3.1M7
+Patch24: 	%{name}-combo-bug-backport.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:  ant
@@ -282,7 +283,7 @@ popd
 pushd plugins/org.eclipse.ui.ide
 %patch23 -p0
 popd
-pushd plugins/org.eclipse.debug.ui
+pushd plugins/org.eclipse.swt/Eclipse\ SWT
 %patch24 -p0
 popd
 
@@ -1038,6 +1039,9 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Mon May 2 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.14
+- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853).
+
 * Sat Apr 30 2005 Ben Konrath <bkonrath@redhat.com> 3.1.0_fc-0.M6.13
 - Add patch to temporarily stop an NPE in debug.ui (rh#155853).