rpms/eclipse/devel eclipse-swtbug291128.patch, 1.1, 1.2 eclipse.spec, 1.698, 1.699

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30627

Modified Files:
	eclipse-swtbug291128.patch eclipse.spec 
Log Message:
* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-27
- Fix patch application.

eclipse-swtbug291128.patch:
 build.xml                  |    1 +
 patches/swtbug291128.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

Index: eclipse-swtbug291128.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-swtbug291128.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-swtbug291128.patch	22 Dec 2009 20:51:13 -0000	1.1
+++ eclipse-swtbug291128.patch	22 Dec 2009 21:55:45 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./build.xml.bug291128 ./build.xml
---- ./build.xml.bug291128	2009-12-22 15:32:52.000000000 -0500
-+++ ./build.xml	2009-12-22 15:34:07.000000000 -0500
+diff -uNr build.xml build.xml
+--- build.xml	2009-11-05 06:15:17.000000000 -0500
++++ build.xml	2009-12-22 16:47:19.000000000 -0500
 @@ -247,6 +247,7 @@
  		<patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="3" />
  		<patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="3" />
@@ -9,11 +9,10 @@ diff -up ./build.xml.bug291128 ./build.x
  		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
  		<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
  		<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
-
-diff -u /dev/null patches/swtbug291128.patch
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ patches/swtbug291128.patch	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,33 @@
+diff -uNr patches/swtbug291128.patch patches/swtbug291128.patch
+--- patches/swtbug291128.patch	1969-12-31 19:00:00.000000000 -0500
++++ patches/swtbug291128.patch	2009-12-22 16:46:54.000000000 -0500
+@@ -0,0 +1,32 @@
 +### Eclipse Workspace Patch 1.0
 +#P org.eclipse.swt
 +Index: Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -46,4 +45,3 @@ diff -u /dev/null patches/swtbug291128.p
 + 		if (object != null) {
 + 			AccessibleObjects.remove (new LONG (atkObject));
 + 			object.release ();
-+


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.698
retrieving revision 1.699
diff -u -p -r1.698 -r1.699
--- eclipse.spec	22 Dec 2009 20:51:13 -0000	1.698
+++ eclipse.spec	22 Dec 2009 21:55:45 -0000	1.699
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        26%{?dist}
+Release:        27%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -191,6 +191,7 @@ developing Eclipse plugins.
 %prep
 %setup -q -n eclipse-build-0_4_RC6
 cp %{SOURCE1} .
+%patch3
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-R3_5_1-fetched-src
 
@@ -1099,6 +1100,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-27
+- Fix patch application.
+
 * Tue Dec 22 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-26
 - Backport eclipse-build patch for e.o#291128.