rpms/eclipse/devel eclipse.spec,1.504,1.505

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20413

Modified Files:
	eclipse.spec 
Log Message:
* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-7
- Un-break non-ppc64 platforms.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- eclipse.spec	22 Nov 2007 18:11:14 -0000	1.504
+++ eclipse.spec	22 Nov 2007 21:48:15 -0000	1.505
@@ -1,6 +1,6 @@
 Epoch:  1
 
-%define gcj_support     1
+%define gcj_support     0
 %define tomcatsharedir  %{_datadir}/tomcat5
 %define tomcatlibdir    %{_var}/lib/tomcat5
 %define eclipse_major   3
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -543,12 +543,10 @@
 # remove ppc64 support from features/org.eclipse.platform.source/feature.xml
 # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
 find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
-# remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
-# FIXME:  do we still need this?
-#sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
+# remove org.eclipse.platform.source.linux.gtk.ppc64
+sed -i "50,54d" features/org.eclipse.platform.source/build.xml
 # replace final occurances with an existing arch
-# FIXME:  do we still need this?
-#sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
+sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
 # Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace 
 # the ia64 strings with ppc64 etc.
 %ifarch ppc64 sparc sparc64 alpha
@@ -1611,6 +1609,9 @@
 %endif
 
 %changelog
+* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-7
+- Un-break non-ppc64 platforms.
+
 * Mon Nov 19 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-6
 - Require jpackage-utils (courtesy Patrice Dumas).
 - Fix ppc64 (and hopefully other unsupported-by-upstream arches).