rpms/eclipse/devel sources,1.75,1.76 eclipse.spec,1.653,1.654

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	sources eclipse.spec 
Log Message:
Fix missing launcher for ppc64.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- sources	3 Aug 2009 15:29:56 -0000	1.75
+++ sources	6 Aug 2009 15:57:33 -0000	1.76
@@ -5,4 +5,4 @@ e1313563c7e36aa46e33789a1386b815  eclips
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
 67c8679981ee3020ec2709d85cfaf4b1  eclipse-3.5.0-testframework.tar.bz2
 047b352b07b04f7f8e96afb81e69862c  eclipse-build-generatedScripts.tar.bz2
-5f22063a596f9b5aa6295d0df20d8c62  eclipse-build-R0_0_2_1.tar.gz
+fed4220be8e4db0743365cfadac65d2e  eclipse-build-R0_0_2_1.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -p -r1.653 -r1.654
--- eclipse.spec	5 Aug 2009 18:38:10 -0000	1.653
+++ eclipse.spec	6 Aug 2009 15:57:33 -0000	1.654
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.3.32%{?dist}
+Release:        0.3.33%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -393,10 +393,6 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 %patch31 -p1
 %patch38
 
-# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
-sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
-  features/org.eclipse.equinox.executable/target.build.xml
-
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
 # the s390x strings with ppc64, etc.
 %ifnarch %{ix86} x86_64
@@ -422,6 +418,7 @@ IFS='
   IFS=$OLDIFS
 
   mv buildConfigs/eclipse-build-config/build.properties.java buildConfigs/eclipse-build-config/build.properties
+  sed -i -e "s|contributed/gtk/linux/ppc64|bin/gtk/linux/ppc64|g" buildConfigs/eclipse-build-config/productFiles/rcpConfig/build.properties
   sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
   sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
 %endif
@@ -1493,6 +1490,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Aug 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.33
+- Fix missing launcher for ppc64.
+
 * Wed Aug 5 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.3.32
 - Manually enable o.e.core.runtime and o.e.equinox.ds because it's not enabled on ppc64.