rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge with upstream for upgrade

Browse Source
This commit is contained in:
Fernando Nasser 2007-07-20 20:57:49 +00:00
parent daaede44f9
commit 5277cfe3f3
9 changed files with 177 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
apache-ant-1.6.5-src.tar.gz
apache-ant-1.7.0-src.tar.gz

429
ant.spec
View File

@ -28,30 +28,19 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define _with_gcj_support 1
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
# Bootstrap sequence is
# 1) rpmbuild ant --with bootstrap1 and install
# 2) build xml-commons-apis and install
# 3) build some jaxp_parser_impl (crimson) and install
# 4) rpmbuild ant --with bootstrap2 and force update
# 5) build rest of full ant BRs and install them
# 6) rpmbuild ant (no special option) and force update
# build while still no jaxp_parser_impl nor xml-commons-apis available
%define bootstrap1 %{?_with_bootstrap1:1}%{!?_with_bootstrap1:%{?_without_bootstrap1:0}%{!?_without_bootstrap1:%{?_bootstrap1:%{_bootstrap1}}%{!?_bootstrap1:0}}}
# build core packages when xml-commons-apis and some jaxp_parser_impl available
%define bootstrap2 %{?_with_bootstrap2:1}%{!?_with_bootstrap2:%{?_without_bootstrap2:0}%{!?_without_bootstrap2:%{?_bootstrap2:%{_bootstrap2}}%{!?_bootstrap2:0}}}
%define with_manifest_only 0
%define ant_home %{_datadir}/ant
%define section free
%define major_version 1.6
%define jpprelease 4jpp
%define major_version 1.7
%define cvs_version 1.7.0
Name: ant
Version: 1.6.5
Release: %{jpprelease}.3%{?dist}
Version: 1.7.0
Release: 1jpp
Epoch: 0
Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java
@ -59,51 +48,38 @@ Summary(fr): Outil de compilation pour java
License: Apache Software License
URL: http://ant.apache.org/
Group: Development/Build Tools
Source0: http://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.gz
Source2: apache-ant-1.6.2.ant.conf
Patch1: apache-ant-1.6.5-rpm.patch
# javah: BZ 157750
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
# https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
# Message-ID: <432A8E37.8050101@zarb.org>
Patch2: apache-ant-1.6.5-javah.patch
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
Source2: apache-ant-%{major_version}.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
Patch4: apache-ant-jars.patch
#Patch5: apache-ant-bz163689.patch
Patch6: apache-ant-1.6.5-jvm1.5-detect.patch
#Patch7: apache-ant-1.6.5-endorsed.patch
Requires: xerces-j2
Patch5: apache-ant-bz163689.patch
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: java-devel >= 0:1.5
BuildRequires: coreutils
BuildRequires: jaxp_parser_impl
BuildRequires: xml-commons-apis
Requires: jaxp_parser_impl
Requires: jpackage-utils >= 0:1.6
Requires(pre): jpackage-utils >= 0:1.6
Requires(postun): jpackage-utils >= 0:1.6
Requires: jpackage-utils >= 0:1.5
Requires: java-devel
Requires: xml-commons-apis
BuildRequires: xerces-j2
BuildRequires: jaxp_parser_impl
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: java-devel
%if ! %{bootstrap1}
Requires: jaxp_parser_impl
BuildRequires: jaxp_parser_impl
Requires: xml-commons-apis
BuildRequires: xml-commons-apis
%endif
%if ! %{gcj_support}
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease}
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease}
# Allow subpackages not in Fedora to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{jpprelease}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Obsoletes: ant-optional ant-optional-full
# Allow subpackages not in RHEL to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{release}
# RHUG
Obsoletes: ant-devel
# Mandriva
Conflicts: j2sdk-ant
# RHEL3 and FC2
Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
Provides: %{name}-libs = %{epoch}:%{version}-%{jpprelease}
Provides: %{name}-core = %{epoch}:%{version}-%{jpprelease}
# FC4
Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc
Provides: %{name}-jmf = %{epoch}:%{version}-%{jpprelease}
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@ -125,6 +101,7 @@ compilazione di programmi java.
Allo stato attuale viene utilizzato dai progetti apache jakarta ed
apache xml.
%if %{with_manifest_only}
%package manifest-only
Summary: Manifest-only jars for %{name}
Group: Development/Build Tools
@ -146,8 +123,8 @@ Requires(postun): java-gcj-compat
%description manifest-only
Manifest-only jars for %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package antlr
Summary: Optional antlr tasks for %{name}
Group: Development/Build Tools
@ -168,9 +145,7 @@ Optional antlr tasks for %{name}.
%description antlr -l fr
Taches antlr optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-bsf
Summary: Optional apache bsf tasks for %{name}
Group: Development/Build Tools
@ -191,9 +166,7 @@ Optional apache bsf tasks for %{name}.
%description apache-bsf -l fr
Taches apache bsf optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-resolver
Summary: Optional apache resolver tasks for %{name}
Group: Development/Build Tools
@ -214,10 +187,7 @@ Optional apache resolver tasks for %{name}.
%description apache-resolver -l fr
Taches apache resolver optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package commons-logging
Summary: Optional commons logging tasks for %{name}
Group: Development/Build Tools
@ -238,11 +208,7 @@ Optional commons logging tasks for %{name}.
%description commons-logging -l fr
Taches commons logging optionelles pour %{name}.
%endif
# Disable because we don't ship the dependencies
%if 0
%if ! %{bootstrap1} && ! %{bootstrap2}
%package commons-net
Summary: Optional commons net tasks for %{name}
Group: Development/Build Tools
@ -263,8 +229,9 @@ Optional commons net tasks for %{name}.
%description commons-net -l fr
Taches commons net optionelles pour %{name}.
%endif
# Disable because we don't ship the dependencies
%if 0
%package jai
Summary: Optional jai tasks for %{name}
Group: Development/Build Tools
@ -287,7 +254,6 @@ Optional jai tasks for %{name}.
Taches jai optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-bcel
Summary: Optional apache bcel tasks for %{name}
Group: Development/Build Tools
@ -296,7 +262,7 @@ Requires: bcel
BuildRequires: bcel
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-bcel < %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-bcel
Conflicts: ant-optional-clean, ant-optional-full
%if %{gcj_support}
@ -310,9 +276,7 @@ Optional apache bcel tasks for %{name}.
%description apache-bcel -l fr
Taches apache bcel optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-log4j
Summary: Optional apache log4j tasks for %{name}
Group: Development/Build Tools
@ -321,7 +285,7 @@ Requires: log4j
BuildRequires: log4j
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-log4j < %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-log4j
Conflicts: ant-optional-clean, ant-optional-full
%if %{gcj_support}
@ -335,9 +299,7 @@ Optional apache log4j tasks for %{name}.
%description apache-log4j -l fr
Taches apache log4j optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-oro
Summary: Optional apache oro tasks for %{name}
Group: Development/Build Tools
@ -346,7 +308,7 @@ Requires: oro
BuildRequires: oro
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro < %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-oro
Conflicts: ant-optional-clean, ant-optional-full
%if %{gcj_support}
@ -360,9 +322,7 @@ Optional apache oro tasks for %{name}.
%description apache-oro -l fr
Taches apache oro optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package apache-regexp
Summary: Optional apache regexp tasks for %{name}
Group: Development/Build Tools
@ -371,7 +331,7 @@ Requires: regexp
BuildRequires: regexp
Provides: ant-apache-regexp = %{epoch}:%{version}-%{release}
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-regexp < %{epoch}:%{version}-%{release}
Obsoletes: ant-jakarta-regexp
Conflicts: ant-optional-clean, ant-optional-full
%if %{gcj_support}
@ -385,9 +345,7 @@ Optional apache regexp tasks for %{name}.
%description apache-regexp -l fr
Taches apache regexp optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package javamail
Summary: Optional javamail tasks for %{name}
Group: Development/Build Tools
@ -410,9 +368,7 @@ Optional javamail tasks for %{name}.
%description javamail -l fr
Taches javamail optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package jdepend
Summary: Optional jdepend tasks for %{name}
Group: Development/Build Tools
@ -433,7 +389,6 @@ Optional jdepend tasks for %{name}.
%description jdepend -l fr
Taches jdepend optionelles pour %{name}.
%endif
%package jmf
Summary: Optional jmf tasks for %{name}
@ -454,7 +409,6 @@ Optional jmf tasks for %{name}.
%description jmf -l fr
Taches jmf optionelles pour %{name}.
%if ! %{bootstrap1} && ! %{bootstrap2}
%package jsch
Summary: Optional jsch tasks for %{name}
Group: Development/Build Tools
@ -475,9 +429,7 @@ Optional jsch tasks for %{name}.
%description jsch -l fr
Taches jsch optionelles pour %{name}.
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%package junit
Summary: Optional junit tasks for %{name}
Group: Development/Build Tools
@ -498,7 +450,6 @@ Optional junit tasks for %{name}.
%description junit -l fr
Taches junit optionelles pour %{name}.
%endif
%package nodeps
Summary: Optional tasks for %{name}
@ -545,8 +496,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jaxp_transform_impl
Provides: ant-trax = %{epoch}:%{version}-%{release}
# The ant-xalan jar has been merged into the ant-trax one
Obsoletes: ant-xalan2 < %{epoch}:%{version}-%{release}
Provides: ant-xalan2 = %{epoch}:%{version}-%{release}
Obsoletes: ant-xalan2
Conflicts: ant-optional-clean, ant-optional-full
%if %{gcj_support}
@ -566,6 +516,7 @@ Summary: Additional scripts for %{name}
Group: Development/Build Tools
AutoReqProv: no
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: /usr/bin/perl
Requires: /usr/bin/python
%description scripts
@ -590,6 +541,8 @@ Documentation pour %{name}.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%description javadoc
Javadoc for %{name}.
@ -600,26 +553,15 @@ Javadoc pour %{name}.
# -----------------------------------------------------------------------------
%prep
%setup -q -n apache-ant-%{version}
# Build OPT_JAR_LIST from the contents of /etc/ant.d/
%patch1 -p1
# #157750: make the javah task work with java-gcj-compat
%patch2 -p1
%setup -q -n apache-ant-%{cvs_version}
# Fix some places where copies of classes are included in the wrong jarfiles
%patch4 -p1 -b .orig
# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
#%ifarch ppc64 s390x
#%patch5 -p1 -b .orig
#%endif
%patch6 -b .sav
## Add endorsed option when running ant
#%patch7 -p1
%ifarch ppc64 s390x
%patch5 -p1 -b .orig
%endif
# clean jar files
find . -name "*.jar" -exec rm -f {} \;
@ -629,7 +571,7 @@ find . -name "*.jar" -exec rm -f {} \;
%build
# classpath selects optional components to build
#export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jai/jai_codec jai/jai_core jsch bsf xml-commons-resolver)
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch bsf xml-commons-resolver)
export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-net commons-logging jsch bsf xml-commons-resolver)
# perform bootstrap and build without jjp or user configs,
# (except JAVA_HOME as required by build script)
@ -656,6 +598,7 @@ cp -p build/lib/%{name}-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher
# optional jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
%if %{with_manifest_only}
cp -p build/lib/%{name}-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
cp -p build/lib/%{name}-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
cp -p build/lib/%{name}-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
@ -664,17 +607,17 @@ cp -p build/lib/%{name}-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%
cp -p build/lib/%{name}-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
cp -p build/lib/%{name}-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
cp -p build/lib/%{name}-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
%if ! %{bootstrap1} && ! %{bootstrap2}
%endif
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
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}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
cp -p build/lib/%{name}-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
#cp -p build/lib/%{name}-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{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
cp -p build/lib/%{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
cp -p build/lib/%{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
cp -p build/lib/%{name}-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{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
ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar
@ -684,7 +627,6 @@ cp -p build/lib/%{name}-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-j
cp -p build/lib/%{name}-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
cp -p build/lib/%{name}-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
cp -p build/lib/%{name}-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
%endif
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
cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar
@ -699,13 +641,6 @@ rm -f src/script/*.cmd
# XSLs
cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
%if %{bootstrap1} || %{bootstrap2}
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend-frames.xsl
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/jdepend.xsl
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-frames.xsl
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/junit-noframes.xsl
rm -f $RPM_BUILD_ROOT%{ant_home}/etc/maudit-frames.xsl
%endif
# install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir}
@ -717,11 +652,11 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
# OPT_JAR_LIST fragments
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
%if ! %{bootstrap1} && ! %{bootstrap2}
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
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 "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai
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
@ -729,11 +664,9 @@ echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-o
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
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
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
%endif
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
@ -741,7 +674,6 @@ echo "jaxp_transform_impl ant/ant-trax" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api)
@ -757,6 +689,17 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
%postun javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
# -----------------------------------------------------------------------------
%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
@ -773,8 +716,6 @@ then
fi
%endif
# We do not ship dependencies for these, so they are disabled.
%if 0
%if %{gcj_support}
%post commons-net
if [ -x %{_bindir}/rebuild-gcj-db ]
@ -791,6 +732,8 @@ then
fi
%endif
# We do not ship dependencies for these, so they are disabled.
%if 0
%if %{gcj_support}
%post jai
if [ -x %{_bindir}/rebuild-gcj-db ]
@ -1067,7 +1010,7 @@ fi
%files
%defattr(0644,root,root,0755)
%doc KEYS LICENSE NOTICE README WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.conf
%config %{_sysconfdir}/%{name}.conf
%attr(0755,root,root) %{_bindir}/ant
%attr(0755,root,root) %{_bindir}/antRun
%{_javadir}/%{name}.jar
@ -1075,7 +1018,6 @@ fi
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-launcher-%{version}.jar
%dir %{_javadir}/%{name}
#%{_javadir}/%{name}/endorsed
%dir %{ant_home}
%dir %{ant_home}/etc
%{ant_home}/etc/ant-update.xsl
@ -1083,6 +1025,7 @@ fi
%{ant_home}/etc/log.xsl
%{ant_home}/etc/tagdiff.xsl
%{ant_home}/etc/junit-frames-xalan1.xsl
%{ant_home}/etc/common2master.xsl
%dir %{ant_home}/lib
%dir %{_sysconfdir}/%{name}.d
@ -1092,6 +1035,7 @@ fi
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-launcher-1.6.5.jar.*
%endif
%if %{with_manifest_only}
%files manifest-only
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/ant-icontract-%{version}.jar
@ -1110,79 +1054,70 @@ fi
%{_javadir}/%{name}/ant-xalan1.jar
%{_javadir}/%{name}/ant-xslp-%{version}.jar
%{_javadir}/%{name}/ant-xslp.jar
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files antlr
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-antlr.jar
%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
%{_sysconfdir}/%{name}.d/antlr
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-bsf
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bsf.jar
%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
%{_sysconfdir}/%{name}.d/apache-bsf
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-resolver
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-resolver.jar
%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
%{_sysconfdir}/%{name}.d/apache-resolver
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files commons-logging
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-commons-logging.jar
%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
%{_sysconfdir}/%{name}.d/commons-logging
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-1.6.5.jar.*
%endif
%endif
# Disable as we dont ship the dependencies
%if 0
%if ! %{bootstrap1} && ! %{bootstrap2}
%files commons-net
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-commons-net.jar
%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
%{_sysconfdir}/%{name}.d/commons-net
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-1.6.5.jar.*
%endif
%endif
# Disable as we dont ship the dependencies
%if 0
%files jai
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jai.jar
%{_javadir}/%{name}/%{name}-jai-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jai
%{_sysconfdir}/%{name}.d/jai
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
@ -1190,82 +1125,71 @@ fi
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-bcel
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bcel.jar
%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
%{_sysconfdir}/%{name}.d/apache-bcel
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-log4j
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-log4j.jar
%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
%{_sysconfdir}/%{name}.d/apache-log4j
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files apache-oro
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-oro.jar
%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
%{_javadir}/%{name}/%{name}-jakarta-oro.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
%{_sysconfdir}/%{name}.d/apache-oro
%{ant_home}/etc/maudit-frames.xsl
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-oro-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%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
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
%{_sysconfdir}/%{name}.d/apache-regexp
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files javamail
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-javamail.jar
%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
%{_sysconfdir}/%{name}.d/javamail
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files jdepend
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jdepend.jar
%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
%{_sysconfdir}/%{name}.d/jdepend
%{ant_home}/etc/jdepend.xsl
%{ant_home}/etc/jdepend-frames.xsl
@ -1273,38 +1197,34 @@ fi
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jdepend-1.6.5.jar.*
%endif
%endif
%files jmf
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jmf.jar
%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
%{_sysconfdir}/%{name}.d/jmf
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-1.6.5.jar.*
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files jsch
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-jsch.jar
%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
%{_sysconfdir}/%{name}.d/jsch
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-1.6.5.jar.*
%endif
%endif
%if ! %{bootstrap1} && ! %{bootstrap2}
%files junit
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-junit.jar
%{_javadir}/%{name}/%{name}-junit-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
%{_sysconfdir}/%{name}.d/junit
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
@ -1312,13 +1232,12 @@ fi
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-junit-1.6.5.jar.*
%endif
%endif
%files nodeps
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-nodeps.jar
%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
%{_sysconfdir}/%{name}.d/nodeps
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
@ -1329,7 +1248,7 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-swing.jar
%{_javadir}/%{name}/%{name}-swing-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/swing
%{_sysconfdir}/%{name}.d/swing
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
@ -1340,7 +1259,7 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-trax.jar
%{_javadir}/%{name}/%{name}-trax-%{version}.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/trax
%{_sysconfdir}/%{name}.d/trax
%{ant_home}/etc/mmetrics-frames.xsl
%{ant_home}/etc/coverage-frames.xsl
@ -1361,171 +1280,39 @@ fi
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
* Wed Apr 25 2007 Permaine Cheung <pcheung@redhat.com> 0:1.6.5-4jpp.3
- Update spec file as per fedora review.
* Wed Jun 20 2007 Fernando Nasser <fnasser at redhat.com> - 0:1.7.0-1jpp
- Upgrade to the final 1.7.0
* Mon Mar 19 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.2
- Get rid of the Provides for ant-optional and ant-optional-full.
* Thu Sep 21 2006 Will Tatam <will.tatam@red61.com> - 0:1.7.0-0.Beta1.1jpp
- Upgraded to 1.7.0Beta1
- removed the apache-ant-1.6.5-jvm1.5-detect.patch as merged upstream
* Fri Mar 16 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-4jpp.1
- Merge with upstream, get rid of the endorsed patch
* Tue Feb 20 2007 Permaine Cheung <pcheung@redhat.com> 1.6.5-2jpp.3
- Add endorsed dir and create symlinks for xml-commons-apis and
jaxp_parser_impl there, and add the option when running ant.
- Add missing BR
- Fix some rpmlint issues
* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-4jpp
- Must skip release 3 because Youri::Bugzilla::_add_version doesn't
distinguish between JPP-1.6 and JPP-1.7 and we have 1.6.5-3 in 1.6
* Fri Feb 09 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.6.5-3jpp
- Added option "bootstrap1" for building core while no jaxp_parser_impl
nor xml-commons-apis available
- Added option "bootstrap2" for building core when some jaxp_parser_impl
and xml-commons-apis available
* Wed Aug 30 2006 Deepak Bhole <dbhole@redhat.com> 1.6.5-2jpp.2
- Re-enabling style and xmlvalidate task on ppc64 and s390x.
* Fri Aug 11 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-2jpp.1
* Fri Aug 11 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-2jpp
- Added conditional native compilation
- Add missing requirements
- Synch with JPackage spec
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.6.5-1jpp_11fc
- Rebuilt
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_10fc
- rebuild
* Thu Jun 1 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-1jpp_9fc
- actually apply the patch added in 8fc!
* Thu Jun 1 2006 Deepak Bhole <dbhole@redhat.com> - 0:1.6.5-1jpp_8fc
- Added patch to fix jvm version detection
- Add missing requirements
- Synch with Fedora spec
* Mon Mar 6 2006 Jeremy Katz <katzj@redhat.com> - 0:1.6.5-1jpp_7fc
- stop scriptlet spew
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_6fc
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_5fc
- rebuilt for new gcc4.1 snapshot and glibc changes
* Thu Feb 2 2006 Archit Shah <ashah@redhat.com> - 0:1.6.5-1jpp_4fc
- build ant without using native code
* Mon Jan 9 2006 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_3fc
- bump again for another gcj fix
* Wed Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_2fc
- rebuilt again
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Fri Dec 9 2005 Jesse Keating <jkeating@redhat.com> - 0:1.6.5-1jpp_1fc
- rebuild for gcc-4.1.0-0.6
* Tue Nov 8 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-0jpp_1fc
- Converted from ISO-8859-1 to UTF-8. (The correct encoding was
somehow lost in going from version 1.58 to 1.59.)
* Thu Nov 3 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-0jpp_1fc
- Changed the Release from 2fc to 0jpp_1fc on the assumption that we
are going to want to resync this package with JPackage if/when the
latter releases ant-1.6.5-1jpp.
* Tue Nov 1 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-2fc
- Removed .jar files from upstream source
* Mon Oct 31 2005 Vadim Nasardinov <vadimn@redhat.com> - 0:1.6.5-1fc
- Upgraded to 1.6.5
- Removed apache-ant-1.6.2.patch. It was no longer relevant due to the
following change upstream:
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v1.41.2.8
- Updated apache-ant-1.6.2-rpm.patch to apache-ant-1.6.5-rpm.patch
- Replaced apache-ant-bz157750.patch with apache-ant-1.6.5-javah.patch
- Converted this spec file from iso-8859-1 to utf-8. (#159586)
* Wed Aug 3 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_14fc
- Allow subpackages not in Fedora to be installed from JPackage.
- Obsolete the jmf subpackage (#164389).
* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_13fc
- Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689).
* Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_12fc
- Built on ia64, ppc64, s390 and s390x.
- Switch to aot-compile-rpm (also BC-compiles subpackages).
- Remove the jmf subpackage since it wasn't being built anyway.
* Fri Jul 15 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).
- Remove jarfiles from the tarball.
* Mon Jun 6 2005 Gary Benson <gbenson at redhat.com>
- Make the javah task fall back to executing javah if
com.sun.tools.javah.Main cannot be found.
* Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
- Rearrange how BC-compiled stuff is built and installed.
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc
- Use absolute paths for rebuild-gcj-db.
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_7fc
- Build the javah task (#157750).
- Add alpha to the list of build architectures (#157522).
* Thu May 5 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_6fc
- Add dependencies for post and postun scriptlets (#156901).
* Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_5fc
- BC-compile the two core jars.
- Own /usr/share/java/ant.
* Fri Apr 08 2005 Andrew Overholt <overholt at redhat.com> 0:1.6.2-3jpp_4fc
- Replace gcj workarounds removed in previous commit.
* Tue Mar 29 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_3fc
- Add NOTICE file as per Apache License version 2.0.
- Remove some now unnecessary gcj workarounds.
- Add the jsch subpackage since we now ship jsch.
* Thu Jan 20 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_2fc
- Use jdtcore.jar instead of ecj.jar when running under libgcj.
* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_1fc
- Upgrade to latest version.
* Wed Jan 12 2005 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_7fc
- Explicitly require java-devel to make beehive play nice.
* Wed Nov 09 2005 Fernando Nasser <fnasser at redhat.com> - 0:1.6.5-1jpp
- Upgrade to 1.6.5
- Incorporate the following changes:
From Gary Benson <gbenson at redhat.com>:
- Allow subpackages not in Fedora to be installed from JPackage
- Add NOTICE file as per Apache License version 2.0
- Own /usr/share/java/ant
From Vadim Nasardinov <vadimn@redhat.com>
- Removed apache-ant-1.6.2.patch. Incorporated upstream.
From David Walluck <david@jpackage.org>
- Add manifest-only package (mainly for eclipse)
- Add conflicts on j2sdk for Mandriva
* Mon Nov 8 2004 Gary Benson <gbenson at redhat.com> - 0:1.6.2-3jpp
- Build OPT_JAR_LIST from files in /etc/ant.d.
* Thu Nov 4 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_6fc
- Build into Fedora.
* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_5fc
- Explicitly require xerces-j2 to make beehive play nice.
* Mon Nov 1 2004 Gary Benson <gbenson at redhat.com> 0:1.6.1-1jpp_4fc
- Bootstrap into Fedora.
* Mon Sep 06 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.6.2-2jpp
- Fix to backward compatibility symbolic links.
@ -1544,7 +1331,7 @@ fi
* Tue Mar 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-1jpp
- Update to Ant 1.6.1
- Change ant launch script to source instead of patch
- Move optional components to ant subdirectory: {_javadir}/{name}
- Move optional components to ant subdirectory: %{_javadir}/%{name}
- Remove os/2 scripts and set JAVA_HOME for build
* Wed Feb 11 2004 Randy Watler <rwatler at finali.com> - 0:1.6.0-1jpp
@ -1689,7 +1476,7 @@ fi
matching package
- added jdepend 2.2
- remove require oro, since ant could works without it
- ant lib is now in {_javadir}/{name}, put external jars here
- ant lib is now in %{_javadir}/%{name}, put external jars here
* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.4.1-12jpp
- hardcoded distribution and vendor tag

12
apache-ant-1.6.5-endorsed.patch
View File

@ -1,12 +0,0 @@
--- ./src/script/ant 2007-02-20 22:52:16.000000000 -0500
+++ ./src/script/ant 2007-02-20 22:52:34.000000000 -0500
@@ -292,6 +292,9 @@ else
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
+
+ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=/usr/share/java/ant/endorsed"
+
ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
if $ant_exec_debug ; then
echo $ant_exec_command

22
apache-ant-1.6.5-javah.patch
View File

@ -1,22 +0,0 @@
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original 2005-10-31 15:05:55.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2005-10-31 15:11:31.000000000 -0500
@@ -104,7 +104,7 @@
}
kaffeDetected = false;
try {
- Class.forName("kaffe.util.NotImplemented");
+ Class.forName("gnu.classpath.Configuration");
kaffeDetected = true;
} catch (Throwable t) {
// swallow as this simply doesn't seem to be Kaffe
--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original 2005-10-31 15:06:34.000000000 -0500
+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2005-10-31 15:08:13.000000000 -0500
@@ -52,7 +52,7 @@
private Commandline setupKaffehCommand(Javah javah) {
Commandline cmd = new Commandline();
- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
+ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
if (javah.getDestdir() != null) {
cmd.createArgument().setValue("-d");

22
apache-ant-1.6.5-jvm1.5-detect.patch
View File

@ -1,22 +0,0 @@
--- ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java.sav 2006-05-31 18:18:10.000000000 -0400
+++ ./src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2006-05-31 18:18:18.000000000 -0400
@@ -95,7 +95,7 @@
Class.forName("java.lang.CharSequence");
javaVersion = JAVA_1_4;
javaVersionNumber++;
- Class.forName("java.lang.Readable");
+ Class.forName("java.net.Proxy");
javaVersion = JAVA_1_5;
javaVersionNumber++;
} catch (Throwable t) {
--- ./build.xml.sav 2006-05-31 18:18:28.000000000 -0400
+++ ./build.xml 2006-05-31 18:18:37.000000000 -0400
@@ -365,7 +365,7 @@
<target name="check_for_optional_packages">
<available property="jdk1.3+" classname="java.lang.StrictMath"/>
<available property="jdk1.4+" classname="java.lang.CharSequence"/>
- <available property="jdk1.5+" classname="java.lang.Readable"/>
+ <available property="jdk1.5+" classname="java.net.Proxy"/>
<available property="kaffe" classname="kaffe.util.NotImplemented"/>
<available property="bsf.present"
classname="org.apache.bsf.BSFManager"

31
apache-ant-1.6.5-rpm.patch
View File

@ -1,31 +0,0 @@
--- apache-ant-1.6.5/src/script/ant.original 2005-10-27 17:06:55.000000000 -0400
+++ apache-ant-1.6.5/src/script/ant 2005-10-27 17:08:45.000000000 -0400
@@ -150,6 +150,28 @@
# variable
if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+
+ # If no optional jars have been specified then build the default list
+ if [ -z "$OPT_JAR_LIST" ] ; then
+ for file in /etc/ant.d/*; do
+ if [ -f "$file" ]; then
+ case "$file" in
+ *~) ;;
+ *#*) ;;
+ *.rpmsave) ;;
+ *.rpmnew) ;;
+ *)
+ for dep in `cat "$file"`; do
+ case "$OPT_JAR_LIST" in
+ *"$dep"*) ;;
+ *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+ esac
+ done
+ esac
+ fi
+ done
+ fi
+
# If the user requested to try to add some other jars to the classpath
if [ -n "$OPT_JAR_LIST" ] ; then
_OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"

0
apache-ant-1.6.2.ant.conf → apache-ant-1.7.ant.conf
View File

13
apache-ant-jars.patch
View File

@ -1,17 +1,14 @@
Some classes are included in more than one jar by accident. Left
unfixed, aot-compile-rpm will subset them.
--- apache-ant-1.6.2/build.xml~ 2005-07-18 10:22:08.000000000 +0100
+++ apache-ant-1.6.2/build.xml 2005-07-18 10:33:51.000000000 +0100
@@ -760,6 +760,7 @@
<selector refid="needs.jdk1.4+"/>
--- apache-ant-1.7.0/build.xml.orig 2007-06-20 14:17:16.000000000 -0400
+++ apache-ant-1.7.0/build.xml 2007-06-20 14:17:39.000000000 -0400
@@ -769,6 +769,7 @@
<selector refid="needs.jdk1.5+"/>
<selector refid="needs.javamail"/>
<selector refid="ant.launcher"/>
+ <selector refid="needs.apache-resolver"/>
</or>
</selector>
</not>
@@ -841,6 +842,7 @@
@@ -848,6 +849,7 @@
<selector refid="needs.jdepend"/>
<selector refid="needs.swing"/>
<selector refid="needs.jsch"/>

2
sources
View File

@ -1 +1 @@
b1a692367b4ef4d08833c434b4863ae9 apache-ant-1.6.5-src.tar.gz
769e022280e6bb1c9615adf336366e9f apache-ant-1.7.0-src.tar.gz