update sparc handling

This commit is contained in:
Dennis Gilmore 2008-06-20 21:54:45 +00:00
parent 3503180aee
commit a7f74f5439
1 changed files with 8 additions and 7 deletions

View File

@ -20,7 +20,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 12%{?dist}
Release: 13%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -571,7 +571,7 @@ sed -i "50,54d" 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
%ifarch ppc64 sparc sparcv9 sparc64 alpha
for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do
tofile=$(echo $f | sed "s/ia64/%{_arch}/")
mv $f $tofile
@ -588,7 +588,7 @@ IFS='
IFS=$OLDIFS
%endif
%ifarch ppc64 sparc sparc64 alpha ia64
%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
IFS='
'
# Copy over the fragments for these arches
@ -627,15 +627,13 @@ for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
done
# Build mozilla bindings against xulrunner
pushd plugins/org.eclipse.swt
# Build mozilla bindings against xulrunner
mv "Eclipse SWT PI" Eclipse_SWT_PI
%patch32
mv Eclipse_SWT_PI "Eclipse SWT PI"
popd
# Create eclipse mozilla profile if it doesn't exist
pushd plugins/org.eclipse.swt
mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla
mv "Eclipse SWT" Eclipse_SWT
%patch33
@ -815,7 +813,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
# Explode the resulting SDK tarball
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
%ifarch ppc64 sparc sparc64 alpha ia64
%ifarch ppc64 sparc sparcv9 sparc64 alpha ia64
cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse
%else
mv $RPM_BUILD_ROOT%{_datadir}/eclipse/eclipse.ini \
@ -1671,6 +1669,9 @@ fi
%endif
%changelog
* Sat Jun 14 2008 Dennis Gilmore <dennis@ausil.us> 3.3.2-13
- make changes to support sparcv9
* Wed May 14 2008 Andrew Overholt <overholt@redhat.com> 3.3.2-12
- Back-port patch for e.o#206432 (rh#446064).