From 2156b36d054cdd35ea7507c83a7ef242dfac7354 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 12 2009 20:05:15 +0000 Subject: base the 32 bit sparc builds off of 32 bit ppc not s390x --- diff --git a/eclipse.spec b/eclipse.spec index 7997513..3dcc66a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 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/ @@ -417,12 +417,12 @@ sed --in-place "s/$swt_frag_ver_s390x/$swt_frag_ver/g" plugins/org.eclipse.swt.g 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 +# Copy all of the s390x directories and files to ppc64 or sparc64 or alpha dirs and replace # the s390x strings with ppc64, etc. %ifnarch %{ix86} x86_64 cp -rp features/org.eclipse.platform/about_files/linux.gtk.{x86,%{_arch}} %endif -%ifarch ppc64 sparc sparcv9 sparc64 alpha +%ifarch ppc64 sparc64 alpha for f in $(find -name \*s390x\*); do tofile=$(echo $f | sed "s/s390x/%{_arch}/") cp -rp $f $tofile @@ -440,6 +440,26 @@ IFS=' done IFS=$OLDIFS %endif +#base 32 bit sparc on ppc +%ifarch sparc sparcv9 + for f in $(find -name \*ppc\*); do + tofile=$(echo $f | sed "s/ppc/%{_arch}/") + cp -rp $f $tofile + for g in $(find $tofile -type f); do + sed -i "s/ppc/%{_arch}/g" $g + done + 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 -a ! -name \*win32\* | grep -v win32); do + sed -i -e "s/ppc/%{_arch}/g" $f + done + IFS=$OLDIFS +%endif + %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 IFS=' @@ -1329,7 +1349,7 @@ fi %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html %{_libdir}/%{name}/links -%ifnarch ppc +%ifnarch ppc sparc sparcv9 %{_libdir}/%{name}/about.html %endif %ifarch x86_64 @@ -1534,6 +1554,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Thu Feb 12 2009 Dennis Gilmore 3.4.1-7 +- base 32 bit sparc on ppc not s390x + * Mon Oct 27 2008 Andrew Overholt 3.4.1-6 - Keep Provides: eclipse on -pde (different than Fedora 9 but probably more correct).