rpms/ant/devel ant.spec,1.52,1.52.2.1

Fri Jul 8 08:52:57 UTC 2005

Author: gbenson

Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8471

Modified Files:
      Tag: ant-bootstrap2-branch
	ant.spec 
Log Message:
Bootstrap onto ia64, ppc64, s390 and s390x


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -u -r1.52 -r1.52.2.1

--- ant.spec	27 Jun 2005 13:13:00 -0000	1.52
+++ ant.spec	8 Jul 2005 08:52:55 -0000	1.52.2.1
@@ -1,9 +1,16 @@
 %define ant_home %{_datadir}/ant
 %define section  free
 
+%ifarch x86_64 ppc
+#%ifarch %{ix86} x86_64 ppc
+%define bootstrap	0
+%else
+%define bootstrap	1
+%endif
+
 Name:           ant
 Version:        1.6.2
-Release:        3jpp_10fc
+Release:        3jpp_11fc
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -34,7 +41,6 @@
 BuildRequires:         gcc-java >= 4.0.0-0.43
 BuildRequires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
 Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch:         %{ix86} x86_64 ppc alpha
 
 %description
 Ant is a platform-independent build tool for java. It's used by apache
@@ -80,6 +86,7 @@
 %description apache-bsf -l fr
 Taches apache bsf optionelles pour %{name}.
 
+%if !%{bootstrap}
 %package apache-resolver
 Summary:        Optional apache resolver tasks for %{name}
 Group:          Development/Build Tools
@@ -143,6 +150,7 @@
 
 %description apache-log4j -l fr
 Taches apache log4j optionelles pour %{name}.
+%endif
 
 %package apache-oro
 Summary:        Optional apache oro tasks for %{name}
@@ -161,6 +169,7 @@
 %description apache-oro -l fr
 Taches apache oro optionelles pour %{name}.
 
+%if !%{bootstrap}
 %package apache-regexp
 Summary:        Optional apache regexp tasks for %{name}
 Group:          Development/Build Tools
@@ -177,6 +186,7 @@
 
 %description apache-regexp -l fr
 Taches apache regexp optionelles pour %{name}.
+%endif
 
 %package javamail
 Summary:        Optional javamail tasks for %{name}
@@ -223,6 +233,7 @@
 %description jmf -l fr
 Taches jmf optionelles pour %{name}.
 
+%if !%{bootstrap}
 %package jsch
 Summary:        Optional jsch tasks for %{name}
 Group:          Development/Build Tools
@@ -237,6 +248,7 @@
 
 %description jsch -l fr
 Taches jsch optionelles pour %{name}.
+%endif
 
 %package junit
 Summary:        Optional junit tasks for %{name}
@@ -393,20 +405,28 @@
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 cp -p build/lib/%{name}-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
 cp -p build/lib/%{name}-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
+%if !%{bootstrap}
 cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
 cp -p build/lib/%{name}-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
 cp -p build/lib/%{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 cp -p build/lib/%{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
+%endif
 cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
+%if !%{bootstrap}
 cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
 ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
+%endif
 ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar
+%if !%{bootstrap}
 ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
+%endif
 cp -p build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
 cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
 cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%if !%{bootstrap}
 cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
+%endif
 cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
 cp -p build/lib/%{name}-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
 cp -p build/lib/%{name}-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
@@ -444,16 +464,22 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
 echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
 echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
+%if !%{bootstrap}
 echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
 echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
 echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
+%endif
 echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
+%if !%{bootstrap}
 echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
+%endif
 echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
 echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
 echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
+%if !%{bootstrap}
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
+%endif
 echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
 echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
 echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
@@ -531,6 +557,7 @@
 %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
 %{_sysconfdir}/%{name}.d/apache-bsf
 
+%if !%{bootstrap}
 %files apache-resolver
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-resolver.jar
@@ -556,6 +583,7 @@
 %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-log4j.jar
 %{_sysconfdir}/%{name}.d/apache-log4j
+%endif
 
 %files apache-oro
 %defattr(0644,root,root,0755)
@@ -565,12 +593,14 @@
 %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
 
+%if !%{bootstrap}
 %files apache-regexp
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-regexp.jar
 %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-regexp.jar
 %{_sysconfdir}/%{name}.d/apache-regexp
+%endif
 
 %files javamail
 %defattr(0644,root,root,0755)
@@ -592,11 +622,13 @@
 %{_javadir}/%{name}/%{name}-jmf-%{version}.jar
 %{_sysconfdir}/%{name}.d/jmf
 
+%if !%{bootstrap}
 %files jsch
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jsch.jar
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
 %{_sysconfdir}/%{name}.d/jsch
+%endif
 
 %files junit
 %defattr(0644,root,root,0755)
@@ -642,6 +674,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Jul  8 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_11fc
+- Bootstrap onto ia64, ppc64, s390 and s390x.
+
 * Wed Jun 15 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_10fc
 - Add the bsf subpackage since we now ship bsf.
 - Remove gcj workaround (not correct, so assume not necessary).


