find -> find -type
This commit is contained in:
parent
ede0f41ddb
commit
a30d16a82d
65
eclipse.spec
65
eclipse.spec
@ -24,7 +24,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||||
Release: 7%{?dist}
|
Release: 8%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
@ -422,7 +422,7 @@ sed -i "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" \
|
|||||||
%ifarch ppc64 sparc sparcv9 sparc64 alpha
|
%ifarch ppc64 sparc sparcv9 sparc64 alpha
|
||||||
for f in $(find -name \*s390x\*); do
|
for f in $(find -name \*s390x\*); do
|
||||||
tofile=$(echo $f | sed "s/s390x/%{_arch}/")
|
tofile=$(echo $f | sed "s/s390x/%{_arch}/")
|
||||||
for g in $(find $f); do
|
for g in $(find -type f $f); do
|
||||||
sed -in "s/s390x/%{_arch}/g" $g
|
sed -in "s/s390x/%{_arch}/g" $g
|
||||||
done
|
done
|
||||||
mv $f $tofile
|
mv $f $tofile
|
||||||
@ -457,35 +457,34 @@ IFS='
|
|||||||
IFS=$OLDIFS
|
IFS=$OLDIFS
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# FIXME: this isn't quite finished yet
|
# libsconfig on the platform on which we're building
|
||||||
## libsconfig on the platform on which we're building
|
sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
|
||||||
#sed -i "s/hpux-motif-PA_RISC/linux-gtk-%{_arch}/" build.xml
|
|
||||||
#
|
# Don't build for non-linux,gtk,%%{_arch} targets
|
||||||
## Don't build for non-linux,gtk,%%{_arch} targets
|
pushd features
|
||||||
#pushd features
|
for f in */build.xml; do
|
||||||
#for f in */build.xml; do
|
for platform in win32 macosx hpux solaris aix qnx motif; 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 "/<ant antfile=\"build.xml\" dir=.*$platform.*target=\"/,/<\/ant>/ d" $f
|
sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$platform\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9\.Iv\-]\+,//g" $f
|
||||||
# sed -i "s/org.eclipse.*.$platform:.*,org/,org/g" $f
|
done
|
||||||
# done
|
done
|
||||||
#done
|
popd
|
||||||
#popd
|
|
||||||
#
|
arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
|
||||||
#arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
|
features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
|
||||||
# features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
|
'{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
|
||||||
# '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
|
|
||||||
#
|
arches=$(echo $arches | sed s/%{_arch}//)
|
||||||
#arches=$(echo $arches | sed s/%{_arch}//)
|
|
||||||
#
|
# Don't build for arches other than the one on which we're building
|
||||||
## Don't build for arches other than the one on which we're building
|
pushd features
|
||||||
#pushd features
|
for f in */build.xml; do
|
||||||
#for f in */build.xml; do
|
for arch in $arches; do
|
||||||
# for arch in $arches; do
|
sed -i "/<ant antfile=\"build.xml\" dir=.*$arch.*target=\"/,/<\/ant>/ d" $f
|
||||||
# sed -i "/<ant antfile=\"build.xml\" dir=.*$arch.*target=\"/,/<\/ant>/ d" $f
|
sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch\(\.[a-z0-9A-Z_]\+\)*:0.0.0,[0-9I\.v\-]\+,//g" $f
|
||||||
# sed -i "s/org.eclipse.*.linux.$arch:.*,org/,org/g" $f
|
done
|
||||||
# done
|
done
|
||||||
#done
|
popd
|
||||||
#popd
|
|
||||||
|
|
||||||
# Symlinks
|
# Symlinks
|
||||||
rm plugins/org.sat4j*
|
rm plugins/org.sat4j*
|
||||||
@ -1381,6 +1380,10 @@ fi
|
|||||||
%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
|
%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 23 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-8
|
||||||
|
- Don't build for arch/ws/os combos other than the one on which we're
|
||||||
|
building
|
||||||
|
|
||||||
* Wed Jul 23 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-7
|
* Wed Jul 23 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-7
|
||||||
- More work on non-upstream arches
|
- More work on non-upstream arches
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user