Author: peroyvind
Date: Thu Feb 15 17:16:28 2007
New Revision: 121435
Modified:
packages/cooker/eclipse/current/SPECS/eclipse.spec
Log:
use %{sunsparc} macro
Modified: packages/cooker/eclipse/current/SPECS/eclipse.spec
==============================================================================
--- packages/cooker/eclipse/current/SPECS/eclipse.spec (original)
+++ packages/cooker/eclipse/current/SPECS/eclipse.spec Thu Feb 15 17:16:28 2007
@@ -136,7 +136,7 @@
%if %{gcj_support}
%else
-ExclusiveArch: %{ix86} x86_64 ppc ia64 sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 %{sunsparc}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: ant
@@ -463,7 +463,7 @@
popd
%patch55 -p0
-rm plugins/org.junit4/junit-4.1.jar
+rm -f plugins/org.junit4/junit-4.1.jar
# I love directories with spaces in their names
pushd plugins/org.eclipse.swt
@@ -506,62 +506,62 @@
ln -s %{_javadir}/icu4j.jar baseLocation/plugins/com.ibm.icu_3.4.5.jar
%endif
## BEGIN ANT ##
-rm plugins/org.apache.ant/lib/ant-antlr.jar
-rm plugins/org.apache.ant/lib/ant-antlrsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant/lib/ant-apache-bcelsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant/lib/ant-apache-log4jsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant/lib/ant-apache-orosrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant/lib/ant-apache-regexpsrc.zip
-rm plugins/org.apache.ant/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant/lib/ant-apache-resolversrc.zip
-rm plugins/org.apache.ant/lib/ant-commons-logging.jar
-rm plugins/org.apache.ant/lib/ant-commons-loggingsrc.zip
-rm plugins/org.apache.ant/lib/ant-commons-net.jar
-rm plugins/org.apache.ant/lib/ant-commons-netsrc.zip
-rm plugins/org.apache.ant/lib/ant-icontract.jar
-rm plugins/org.apache.ant/lib/ant-icontractsrc.zip
-rm plugins/org.apache.ant/lib/ant-jai.jar
-rm plugins/org.apache.ant/lib/ant-jaisrc.zip
-rm plugins/org.apache.ant/lib/ant.jar
-rm plugins/org.apache.ant/lib/antsrc.zip
-rm plugins/org.apache.ant/lib/ant-javamail.jar
-rm plugins/org.apache.ant/lib/ant-javamailsrc.zip
-rm plugins/org.apache.ant/lib/ant-jdepend.jar
-rm plugins/org.apache.ant/lib/ant-jdependsrc.zip
-rm plugins/org.apache.ant/lib/ant-jmf.jar
-rm plugins/org.apache.ant/lib/ant-jmfsrc.zip
-rm plugins/org.apache.ant/lib/ant-jsch.jar
-rm plugins/org.apache.ant/lib/ant-jschsrc.zip
-rm plugins/org.apache.ant/lib/ant-junit.jar
-rm plugins/org.apache.ant/lib/ant-junitsrc.zip
-rm plugins/org.apache.ant/lib/ant-launcher.jar
-rm plugins/org.apache.ant/lib/ant-launchersrc.zip
-rm plugins/org.apache.ant/lib/ant-netrexx.jar
-rm plugins/org.apache.ant/lib/ant-netrexxsrc.zip
-rm plugins/org.apache.ant/lib/ant-nodeps.jar
-rm plugins/org.apache.ant/lib/ant-nodepssrc.zip
-rm plugins/org.apache.ant/lib/ant-starteam.jar
-rm plugins/org.apache.ant/lib/ant-starteamsrc.zip
-rm plugins/org.apache.ant/lib/ant-stylebook.jar
-rm plugins/org.apache.ant/lib/ant-stylebooksrc.zip
-rm plugins/org.apache.ant/lib/ant-swing.jar
-rm plugins/org.apache.ant/lib/ant-swingsrc.zip
-rm plugins/org.apache.ant/lib/ant-trax.jar
-rm plugins/org.apache.ant/lib/ant-traxsrc.zip
-rm plugins/org.apache.ant/lib/ant-vaj.jar
-rm plugins/org.apache.ant/lib/ant-vajsrc.zip
-rm plugins/org.apache.ant/lib/ant-weblogic.jar
-rm plugins/org.apache.ant/lib/ant-weblogicsrc.zip
-rm plugins/org.apache.ant/lib/ant-xalan1.jar
-rm plugins/org.apache.ant/lib/ant-xalan1src.zip
-rm plugins/org.apache.ant/lib/ant-xslp.jar
-rm plugins/org.apache.ant/lib/ant-xslpsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-antlr.jar
+rm -f plugins/org.apache.ant/lib/ant-antlrsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-bcel.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-bcelsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-bsf.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-log4j.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-log4jsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-oro.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-orosrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-regexp.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-regexpsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-apache-resolver.jar
+rm -f plugins/org.apache.ant/lib/ant-apache-resolversrc.zip
+rm -f plugins/org.apache.ant/lib/ant-commons-logging.jar
+rm -f plugins/org.apache.ant/lib/ant-commons-loggingsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
+rm -f plugins/org.apache.ant/lib/ant-commons-netsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-icontract.jar
+rm -f plugins/org.apache.ant/lib/ant-icontractsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-jai.jar
+rm -f plugins/org.apache.ant/lib/ant-jaisrc.zip
+rm -f plugins/org.apache.ant/lib/ant.jar
+rm -f plugins/org.apache.ant/lib/antsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-javamail.jar
+rm -f plugins/org.apache.ant/lib/ant-javamailsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-jdepend.jar
+rm -f plugins/org.apache.ant/lib/ant-jdependsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-jmf.jar
+rm -f plugins/org.apache.ant/lib/ant-jmfsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-jsch.jar
+rm -f plugins/org.apache.ant/lib/ant-jschsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-junit.jar
+rm -f plugins/org.apache.ant/lib/ant-junitsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-launcher.jar
+rm -f plugins/org.apache.ant/lib/ant-launchersrc.zip
+rm -f plugins/org.apache.ant/lib/ant-netrexx.jar
+rm -f plugins/org.apache.ant/lib/ant-netrexxsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-nodeps.jar
+rm -f plugins/org.apache.ant/lib/ant-nodepssrc.zip
+rm -f plugins/org.apache.ant/lib/ant-starteam.jar
+rm -f plugins/org.apache.ant/lib/ant-starteamsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-stylebook.jar
+rm -f plugins/org.apache.ant/lib/ant-stylebooksrc.zip
+rm -f plugins/org.apache.ant/lib/ant-swing.jar
+rm -f plugins/org.apache.ant/lib/ant-swingsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-trax.jar
+rm -f plugins/org.apache.ant/lib/ant-traxsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-vaj.jar
+rm -f plugins/org.apache.ant/lib/ant-vajsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-weblogic.jar
+rm -f plugins/org.apache.ant/lib/ant-weblogicsrc.zip
+rm -f plugins/org.apache.ant/lib/ant-xalan1.jar
+rm -f plugins/org.apache.ant/lib/ant-xalan1src.zip
+rm -f plugins/org.apache.ant/lib/ant-xslp.jar
+rm -f plugins/org.apache.ant/lib/ant-xslpsrc.zip
# FIXME use build-jar-repository
ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
ln -s %{_javadir}/ant/ant-apache-bcel.jar
plugins/org.apache.ant/lib/ant-apache-bcel.jar
@@ -586,10 +586,10 @@
ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
## END ANT ##
# BEGIN LUCENE ##
-rm plugins/org.apache.lucene/lucene-1.4.3.jar
+rm -f plugins/org.apache.lucene/lucene-1.4.3.jar
# FIXME: Remove this zip until we have a lucene-devel package containing it.
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=170343
-rm plugins/org.apache.lucene/lucene-1.4.3-src.zip
+rm -f plugins/org.apache.lucene/lucene-1.4.3-src.zip
ln -s %{_datadir}/lucene/lucene-src.zip
plugins/org.apache.lucene/lucene-1.4.3-src.zip
ln -s %{_datadir}/lucene/lucene-demos.jar plugins/org.apache.lucene/parser.jar
ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
@@ -597,28 +597,28 @@
## BEGIN TOMCAT ##
-rm plugins/org.eclipse.tomcat/commons-beanutils.jar
-rm plugins/org.eclipse.tomcat/commons-collections.jar
-rm plugins/org.eclipse.tomcat/commons-digester.jar
-rm plugins/org.eclipse.tomcat/commons-logging-api.jar
-rm plugins/org.eclipse.tomcat/commons-modeler.jar
-rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
-rm plugins/org.eclipse.tomcat/servlet.jar
-rm plugins/org.eclipse.tomcat/servlets-manager.jar
-rm plugins/org.eclipse.tomcat/naming-common.jar
-rm plugins/org.eclipse.tomcat/servlets-common.jar
-rm plugins/org.eclipse.tomcat/tomcat-http11.jar
-rm plugins/org.eclipse.tomcat/bootstrap.jar
-rm plugins/org.eclipse.tomcat/catalina.jar
-rm plugins/org.eclipse.tomcat/jasper-compiler.jar
-rm plugins/org.eclipse.tomcat/jasper-runtime.jar
-rm plugins/org.eclipse.tomcat/mx4j-jmx.jar
-rm plugins/org.eclipse.tomcat/naming-resources.jar
-rm plugins/org.eclipse.tomcat/naming-factory.jar
-rm plugins/org.eclipse.tomcat/servlets-default.jar
-rm plugins/org.eclipse.tomcat/servlets-invoker.jar
-rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
-rm plugins/org.eclipse.tomcat/tomcat-util.jar
+rm -f plugins/org.eclipse.tomcat/commons-beanutils.jar
+rm -f plugins/org.eclipse.tomcat/commons-collections.jar
+rm -f plugins/org.eclipse.tomcat/commons-digester.jar
+rm -f plugins/org.eclipse.tomcat/commons-logging-api.jar
+rm -f plugins/org.eclipse.tomcat/commons-modeler.jar
+rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
+rm -f plugins/org.eclipse.tomcat/servlet.jar
+rm -f plugins/org.eclipse.tomcat/servlets-manager.jar
+rm -f plugins/org.eclipse.tomcat/naming-common.jar
+rm -f plugins/org.eclipse.tomcat/servlets-common.jar
+rm -f plugins/org.eclipse.tomcat/tomcat-http11.jar
+rm -f plugins/org.eclipse.tomcat/bootstrap.jar
+rm -f plugins/org.eclipse.tomcat/catalina.jar
+rm -f plugins/org.eclipse.tomcat/jasper-compiler.jar
+rm -f plugins/org.eclipse.tomcat/jasper-runtime.jar
+rm -f plugins/org.eclipse.tomcat/mx4j-jmx.jar
+rm -f plugins/org.eclipse.tomcat/naming-resources.jar
+rm -f plugins/org.eclipse.tomcat/naming-factory.jar
+rm -f plugins/org.eclipse.tomcat/servlets-default.jar
+rm -f plugins/org.eclipse.tomcat/servlets-invoker.jar
+rm -f plugins/org.eclipse.tomcat/tomcat-coyote.jar
+rm -f plugins/org.eclipse.tomcat/tomcat-util.jar
mkdir -p plugins/org.eclipse.tomcat/lib
ln -s %{tomcatsharedir}/bin/bootstrap.jar
plugins/org.eclipse.tomcat/lib/bootstrap.jar
ln -s %{tomcatlibdir}/server/lib/catalina.jar
plugins/org.eclipse.tomcat/lib/catalina.jar
@@ -681,7 +681,7 @@
# nasty hack to get suppport for ppc64, s390(x) and sparc(64)
# move all of the ia64 directories to ppc64 or s390(x) or sparc(64) dirs and
replace
# the ia64 strings with ppc64 or s390(x)
-%ifarch ppc64 s390 s390x sparc sparc64
+%ifarch ppc64 s390 s390x %{sunsparc}
# there is only partial support for ppc64 in 3.2 so we have to remove this
# partial support to get the replacemnt hack to work
find -name \*ppc64\* | xargs rm -r
@@ -716,7 +716,7 @@
popd
# setup the jsch plugin build
-rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
+rm -f plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar
# FIXME remove version number, file a bug about this
pushd baseLocation/plugins
# get the Manifest file
@@ -752,7 +752,7 @@
# delete included jars
# FIXME: file a bug about these
-rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
+rm -f plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
plugins/org.eclipse.swt/extra_jars/exceptions.jar \
plugins/org.eclipse.swt.tools/swttools.jar \
features/org.eclipse.platform.launchers/bin/startup.jar
@@ -1095,34 +1095,34 @@
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
## BEGIN ANT ##
-rm plugins/org.apache.ant_*/lib/ant-antlr.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-oro.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
-rm plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
-rm plugins/org.apache.ant_*/lib/ant-commons-logging.jar
-rm plugins/org.apache.ant_*/lib/ant-commons-net.jar
-rm plugins/org.apache.ant_*/lib/ant-icontract.jar
-rm plugins/org.apache.ant_*/lib/ant-jai.jar
-rm plugins/org.apache.ant_*/lib/ant.jar
-rm plugins/org.apache.ant_*/lib/ant-javamail.jar
-rm plugins/org.apache.ant_*/lib/ant-jdepend.jar
-rm plugins/org.apache.ant_*/lib/ant-jmf.jar
-rm plugins/org.apache.ant_*/lib/ant-jsch.jar
-rm plugins/org.apache.ant_*/lib/ant-junit.jar
-rm plugins/org.apache.ant_*/lib/ant-launcher.jar
-rm plugins/org.apache.ant_*/lib/ant-netrexx.jar
-rm plugins/org.apache.ant_*/lib/ant-nodeps.jar
-rm plugins/org.apache.ant_*/lib/ant-starteam.jar
-rm plugins/org.apache.ant_*/lib/ant-stylebook.jar
-rm plugins/org.apache.ant_*/lib/ant-swing.jar
-rm plugins/org.apache.ant_*/lib/ant-trax.jar
-rm plugins/org.apache.ant_*/lib/ant-vaj.jar
-rm plugins/org.apache.ant_*/lib/ant-weblogic.jar
-rm plugins/org.apache.ant_*/lib/ant-xalan1.jar
-rm plugins/org.apache.ant_*/lib/ant-xslp.jar
+rm -f plugins/org.apache.ant_*/lib/ant-antlr.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-oro.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
+rm -f plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
+rm -f plugins/org.apache.ant_*/lib/ant-commons-logging.jar
+rm -f plugins/org.apache.ant_*/lib/ant-commons-net.jar
+rm -f plugins/org.apache.ant_*/lib/ant-icontract.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
+rm -f plugins/org.apache.ant_*/lib/ant.jar
+rm -f plugins/org.apache.ant_*/lib/ant-javamail.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jdepend.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jsch.jar
+rm -f plugins/org.apache.ant_*/lib/ant-junit.jar
+rm -f plugins/org.apache.ant_*/lib/ant-launcher.jar
+rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
+rm -f plugins/org.apache.ant_*/lib/ant-nodeps.jar
+rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
+rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
+rm -f plugins/org.apache.ant_*/lib/ant-swing.jar
+rm -f plugins/org.apache.ant_*/lib/ant-trax.jar
+rm -f plugins/org.apache.ant_*/lib/ant-vaj.jar
+rm -f plugins/org.apache.ant_*/lib/ant-weblogic.jar
+rm -f plugins/org.apache.ant_*/lib/ant-xalan1.jar
+rm -f plugins/org.apache.ant_*/lib/ant-xslp.jar
# FIXME use build-jar-repository
ln -s %{_javadir}/ant/ant-antlr.jar
plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar
ln -s %{_javadir}/ant/ant-apache-bcel.jar
plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar
@@ -1148,14 +1148,14 @@
## END ANT ##
# BEGIN LUCENE ##
# FIXME: rm -f in ln
-rm plugins/org.apache.lucene_*/lucene-1.4.3.jar
-rm plugins/org.apache.lucene_*/parser.jar
+rm -f plugins/org.apache.lucene_*/lucene-1.4.3.jar
+rm -f plugins/org.apache.lucene_*/parser.jar
# FIXME
ln -s %{_javadir}/lucene.jar
plugins/org.apache.lucene_1.4.103.v20060601/lucene-1.4.3.jar
ln -s %{_datadir}/lucene/lucene-demos.jar
plugins/org.apache.lucene_1.4.103.v20060601/parser.jar
# END LUCENE ##
# FIXME
-##rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
+##rm -f plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
##ln -s %{_javadir}/jsch.jar
plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
## BEGIN TOMCAT ##
