rpms/eclipse/devel eclipse-buildswtnatives.patch, 1.2, 1.3 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.6, 1.7 eclipse.spec, 1.632, 1.633 eclipse-ecj-rpmdebuginfo.patch, 1.3, NONE eclipse-pdeapicasting-ui.patch, 1.1, NONE ecj.sh.in, 1.1, NONE eclipse-pdeapicasting.patch, 1.1, NONE eclipse-ecj-defaultto1.5.patch, 1.1, NONE

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	eclipse-buildswtnatives.patch 
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch eclipse.spec 
Removed Files:
	eclipse-ecj-rpmdebuginfo.patch eclipse-pdeapicasting-ui.patch 
	ecj.sh.in eclipse-pdeapicasting.patch 
	eclipse-ecj-defaultto1.5.patch 
Log Message:
- Remove patches for the ecj package and others already applied upstream.
- Rediff some ppc64 patches.

eclipse-buildswtnatives.patch:

Index: eclipse-buildswtnatives.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-buildswtnatives.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-buildswtnatives.patch	2 Apr 2009 08:12:56 -0000	1.2
+++ eclipse-buildswtnatives.patch	13 Apr 2009 13:56:20 -0000	1.3
@@ -53,18 +53,6 @@
  		<available property="@dot" file="${build.result.folder}/@dot" />
 --- ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml.orig	2009-03-24 18:54:29.000000000 +0100
 +++ ./plugins/org.eclipse.swt.gtk.linux.s390x/build.xml	2009-03-25 10:08:51.000000000 +0100
-@@ -276,6 +276,11 @@
- 	</target>
- 
- 	<target name="build.cfiles" depends="build.jars">
-+		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
-+		<!--compile swtools.jar in org.eclipse.swt.tools-->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />
-+
- 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
- 		<!-- assumes the swt.jar has already been built  -->
- 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar">
 @@ -330,6 +335,7 @@
  			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library" />
  			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library" />

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	26 Feb 2009 16:25:24 -0000	1.6
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	13 Apr 2009 13:56:20 -0000	1.7
@@ -53,16 +53,18 @@
           os="solaris"
           ws="gtk"
 diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.arches	2008-10-03 09:05:08.000000000 -0400
-+++ ./features/org.eclipse.rcp.source/feature.xml	2008-10-03 09:07:51.000000000 -0400
-@@ -45,6 +45,10 @@
- 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.4.1.v3452b" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.4.1.v3452b" os="linux" arch="x86" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.4.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.4.1.v3452b" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.4.1.v3452b" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.4.1.v3452b" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
-+	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.4.1.v3452b" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.4.1.v3452b" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
- 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.4.1.v3452b" os="qnx" arch="x86" ws="photon"  unpack="false"/>
- 	<plugin id="org.eclipse.rcp.source" version="3.4.1.R342_v20090205"     unpack="false"/>
+--- ./features/org.eclipse.rcp.source/feature.xml.orig	2009-04-13 15:04:47.000000000 +0200
++++ ./features/org.eclipse.rcp.source/feature.xml	2009-04-13 15:07:51.000000000 +0200
+@@ -49,7 +49,11 @@
+ 	<plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3539" os="hpux" arch="ia64_32" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3539" os="linux" arch="x86" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk"  unpack="false"/>
+-	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk"  unpack="false"/>
++	<plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk"  unpack="false"/>
++ 	<plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif"  unpack="false"/>
+ 	<plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3539" os="qnx" arch="x86" ws="photon"  unpack="false"/>
+ 	<plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507"     unpack="false"/>
+ 	<plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302"     unpack="false"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- eclipse.spec	13 Apr 2009 09:55:34 -0000	1.632
+++ eclipse.spec	13 Apr 2009 13:56:20 -0000	1.633
@@ -29,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.12%{?dist}
+Release:        0.2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -409,8 +409,7 @@
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
-# TODO check this patch
-#%patch28
+%patch28
 # TODO and this one
 #%patch30
 %patch31 -p1
@@ -1593,6 +1592,10 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2
+- Remove patches for the ecj package and others already applied upstream.
+- Rediff some ppc64 patches.
+
 * Mon Apr 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.1.12
 - o.e.update.core.linux is x86 only.
 


--- eclipse-ecj-rpmdebuginfo.patch DELETED ---


--- eclipse-pdeapicasting-ui.patch DELETED ---


--- ecj.sh.in DELETED ---


--- eclipse-pdeapicasting.patch DELETED ---


--- eclipse-ecj-defaultto1.5.patch DELETED ---