rpms/eclipse/devel sources, 1.85, 1.86 eclipse.spec, 1.679, 1.680 eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.11, NONE eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.9, NONE eclipse-add-ppc64-filesystem.patch, 1.1, NONE

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-add-ppc64-sparc64-s390-s390x.patch 
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch 
	eclipse-add-ppc64-filesystem.patch 
Log Message:
- New e-b snapshot that contains fragments for ppc64.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- sources	12 Oct 2009 14:15:58 -0000	1.85
+++ sources	19 Oct 2009 13:31:15 -0000	1.86
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz
+bcca730657556ad9662e326570e0e66a  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.679
retrieving revision 1.680
diff -u -p -r1.679 -r1.680
--- eclipse.spec	15 Oct 2009 10:33:35 -0000	1.679
+++ eclipse.spec	19 Oct 2009 13:31:15 -0000	1.680
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -43,15 +43,10 @@ Source19:       %{name}-filenamepatterns
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-
-Patch2:        %{name}-add-ppc64-filesystem.patch
-
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch3:        %{name}-target-platform-template.patch
+Patch0:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -240,13 +235,6 @@ swt_frag_ver_s390x=$(grep "version\.suff
 sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
                                                       plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
 
-# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
-%ifarch ppc64
-%patch0 -p1
-%patch1
-%patch2
-%endif
-
 # 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
@@ -278,47 +266,6 @@ IFS='
   sed -i -e "s/%{_arch}/s390x/g" plugins/org.eclipse.equinox.launcher.gtk.linux.s390x/META-INF/MANIFEST.MF
 %endif
 
-%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
-IFS='
-'
-  # Fragments for these arches
-  rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-  cp -R plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch}
-  cp -R plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.core.filesystem.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  rm -rf plugins/org.eclipse.swt.gtk.linux.%{_arch}
-  cp -R plugins/org.eclipse.swt.gtk.linux.{ppc,%{_arch}}
-  pushd plugins/org.eclipse.swt.gtk.linux.%{_arch}
-    for f in $(find -type f); do
-      sed -i -e "s/ppc/%{_arch}/g" $f
-      tofile=$(echo $f | sed "s/ppc/%{_arch}/")
-      if [ $tofile != $f ]; then
-        cp -rp $f $tofile
-      fi
-    done
-  popd
-  IFS=$OLDIFS
-
-%endif
-
 %if ! %{bootstrap}
 # Symlinks
 rm plugins/org.sat4j*
@@ -478,7 +425,7 @@ fi
 %endif
 
 # target platform template patch
-%patch3 -p0
+%patch0 -p0
 popd
 
 %build
@@ -1181,6 +1128,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Oct 19 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-9
+- New e-b snapshot that contains fragments for ppc64.
+
 * Thu Oct 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-8
 - Add bootstrap flag.
 


--- eclipse-add-ppc64-sparc64-s390-s390x.patch DELETED ---


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


--- eclipse-add-ppc64-filesystem.patch DELETED ---