- Un-break non-ppc64 platforms.
This commit is contained in:
parent
7b4ca0d3e0
commit
d97bcaeffa
15
eclipse.spec
15
eclipse.spec
|
@ -1,6 +1,6 @@
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
%define gcj_support 1
|
%define gcj_support 0
|
||||||
%define tomcatsharedir %{_datadir}/tomcat5
|
%define tomcatsharedir %{_datadir}/tomcat5
|
||||||
%define tomcatlibdir %{_var}/lib/tomcat5
|
%define tomcatlibdir %{_var}/lib/tomcat5
|
||||||
%define eclipse_major 3
|
%define eclipse_major 3
|
||||||
|
@ -19,7 +19,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: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
License: Eclipse Public License
|
License: Eclipse Public License
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
@ -543,12 +543,10 @@ find -name \*ppc64\* | xargs rm -r
|
||||||
# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
|
# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
|
||||||
# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
|
# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
|
||||||
find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
|
find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
|
||||||
# remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq
|
# remove org.eclipse.platform.source.linux.gtk.ppc64
|
||||||
# FIXME: do we still need this?
|
sed -i "50,54d" features/org.eclipse.platform.source/build.xml
|
||||||
#sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
|
|
||||||
# replace final occurances with an existing arch
|
# replace final occurances with an existing arch
|
||||||
# FIXME: do we still need this?
|
sed --in-place "s/ppc64/x86_64/g" 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
|
# Move all of the ia64 directories and files to ppc64 or sparc{,64} or alpha dirs and replace
|
||||||
# the ia64 strings with ppc64 etc.
|
# the ia64 strings with ppc64 etc.
|
||||||
%ifarch ppc64 sparc sparc64 alpha
|
%ifarch ppc64 sparc sparc64 alpha
|
||||||
|
@ -1611,6 +1609,9 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 22 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-7
|
||||||
|
- Un-break non-ppc64 platforms.
|
||||||
|
|
||||||
* Mon Nov 19 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-6
|
* Mon Nov 19 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-6
|
||||||
- Require jpackage-utils (courtesy Patrice Dumas).
|
- Require jpackage-utils (courtesy Patrice Dumas).
|
||||||
- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
|
- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
|
||||||
|
|
Loading…
Reference in New Issue