rpms/eclipse/devel eclipse.spec,1.559,1.560

[Andrew Overholt (overholt)]

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-7
- More work on non-upstream arches


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- eclipse.spec	22 Jul 2008 18:37:45 -0000	1.559
+++ eclipse.spec	23 Jul 2008 23:47:14 -0000	1.560
@@ -24,7 +24,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        6%{?dist} 
+Release:        7%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -391,20 +391,20 @@
 find -name \*.so | xargs rm
 find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
 
-# FIXME
+# FIXME:  do this as part of Linux distros project
 #
-# the swt version is set to HEAD on ia64 but shouldn't be
+# the swt version is set to HEAD on s390x but shouldn't be
 # get swt version
 SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
-sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \
-                                                      plugins/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.ia64.source/META-INF/MANIFEST.MF \
-                                                      plugins/org.eclipse.swt.gtk.linux.ia64.source/build.xml \
-                                                      assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
+swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:")
+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 \
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source/META-INF/MANIFEST.MF \
+                                                      plugins/org.eclipse.swt.gtk.linux.s390x.source/build.xml \
+                                                      assemble.org.eclipse.sdk.linux.gtk.s390x.xml \
 						      features/org.eclipse.rcp/build.xml
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
@@ -416,21 +416,24 @@
 # 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
-# Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace 
-# the ia64 strings with ppc64, etc.
+
+# Move all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace 
+# the s390x strings with ppc64, etc.
 %ifarch ppc64 sparc sparcv9 sparc64 alpha
-  for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32 | grep -v win32); do
-    tofile=$(echo $f | sed "s/ia64/%{_arch}/")
+  for f in $(find -name \*s390x\*); do
+    tofile=$(echo $f | sed "s/s390x/%{_arch}/")
+    for g in $(find $f); do
+	sed -in "s/s390x/%{_arch}/g" $g
+    done
     mv $f $tofile
-#    sed --in-place "s/ia64/%{_arch}/g" $tofile
   done
   OLDIFS=$IFS
 IFS='
 '
   for f in $(find -type f ! -name \*.java -a ! -name feature.xml -a ! -name \*.gif \
   -a ! -name \*.png -a ! -name \*.htm* -a ! -name \*.jar -a ! -name \
-  \*.exe -a ! -name \*.pm -a ! -name \*.jpg); do
-   sed -i -e "s/ia64_32/@eye-eh-64_32@/g" -e "s/ia64/%{_arch}/g" -e "s/@eye-eh-64_32@/ia64_32/g" $f
+  \*.exe -a ! -name \*.pm -a ! -name \*.jpg -a ! -name \*win32\* | grep -v win32); do
+   sed -i -e "s/s390x/%{_arch}/g" $f
   done
   IFS=$OLDIFS
 %endif
@@ -454,6 +457,36 @@
   IFS=$OLDIFS
 %endif 
 
+# FIXME:  this isn't quite finished yet
+## libsconfig on the platform on which we're building
+#sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
+#
+## Don't build for non-linux,gtk,%%{_arch} targets
+#pushd features
+#for f in */build.xml; do
+#    for platform in win32 macosx hpux solaris aix qnx motif; do
+#      sed -i "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
+#      sed -i "s/org.eclipse.*.$platform:.*,org/,org/g" $f
+#    done
+#done
+#popd
+#
+#arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
+#  features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
+#  '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
+#
+#arches=$(echo $arches | sed s/%{_arch}//)
+#
+## Don't build for arches other than the one on which we're building
+#pushd features
+#for f in */build.xml; do
+#    for arch in $arches; do
+#      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch.*target=\"/,/<\/ant>/ d" $f
+#      sed -i "s/org.eclipse.*.linux.$arch:.*,org/,org/g" $f
+#    done
+#done
+#popd
+
 # Symlinks
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core_* plugins/
@@ -1348,6 +1381,9 @@
 %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
 
 %changelog
+* Wed Jul 23 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-7
+- More work on non-upstream arches
+
 * Mon Jul 21 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-6
 - Update description to be a bit more current
 - Attempt ppc64, etc. builds