auto-import changelog data from ant-1.5.2-22.src.rpm

Tue Nov 11 2003 Gary Benson <gbenson@redhat.com> 1.5.2-22
- Install links to JAF, JavaMail and JUnit jarfiles for classic-ant.
- Build all optional tasks that we are able to.
This commit is contained in:
cvsdist 2004-09-09 15:59:11 +00:00
parent 6ef3833525
commit 314c7df63b
3 changed files with 35 additions and 15 deletions

View File

@ -1,2 +1,2 @@
apache-ant-1.5.2-src.tar.bz2 apache-ant-1.5.2-src.tar.bz2
rhug-jakarta-ant-20031106.tar.bz2 rhug-jakarta-ant-20031111.tar.bz2

View File

@ -1,11 +1,11 @@
%define rhugversion 20031106 %define rhugversion 20031111
%define rhugsource1 apache-%{name}-%{version} upstream %define rhugsource1 apache-%{name}-%{version} upstream
%define rhugpatches 6 %define rhugpatches 6
Summary: Build tool for Java applications Summary: Build tool for Java applications
Name: ant Name: ant
Version: 1.5.2 Version: 1.5.2
Release: 21 Release: 22
URL: http://ant.apache.org/ URL: http://ant.apache.org/
Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2 Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2
Source1: apache-%{name}-%{version}-src.tar.bz2 Source1: apache-%{name}-%{version}-src.tar.bz2
@ -97,14 +97,15 @@ done
# HACK: These three files cause gcj-ssa to ICE on 64-bit boxes when # HACK: These three files cause gcj-ssa to ICE on 64-bit boxes when
# -O2 is used, so we build them separately with optimisation disabled. # -O2 is used, so we build them separately with optimisation disabled.
CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa GCJFLAGS="-g -O0" \ CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa GCJFLAGS="-g -O0" \
./configure --disable-static --prefix=%{_prefix} ./configure --disable-static --prefix=%{_prefix} --libdir=%{_libdir}
make upstream/src/main/org/apache/tools/ant/taskdefs/Checksum.lo \ make upstream/src/main/org/apache/tools/ant/taskdefs/Checksum.lo \
upstream/src/main/org/apache/tools/ant/taskdefs/Expand.lo \ upstream/src/main/org/apache/tools/ant/taskdefs/Expand.lo \
upstream/src/main/org/apache/tools/ant/taskdefs/FixCRLF.lo upstream/src/main/org/apache/tools/ant/taskdefs/FixCRLF.lo \
upstream/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.lo
# End of Hack # End of Hack
%endif %endif
CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa \ CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa \
./configure --disable-static --prefix=%{_prefix} ./configure --disable-static --prefix=%{_prefix} --libdir=%{_libdir}
make make
%install %install
@ -120,22 +121,37 @@ install -m 644 $RPM_SOURCE_DIR/ant.conf ${RPM_BUILD_ROOT}%{_sysconfdir}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/ant/lib mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/ant/lib
install -m 644 $RPM_SOURCE_DIR/README.anthome \ install -m 644 $RPM_SOURCE_DIR/README.anthome \
${RPM_BUILD_ROOT}%{_datadir}/ant/README ${RPM_BUILD_ROOT}%{_datadir}/ant/README
ln -s ../../java/ant-%{version}.jar \ for i in ant ant-optional; do
${RPM_BUILD_ROOT}%{_datadir}/ant/lib/ant.jar ln -s ../../java/$i-%{version}.jar \
for i in bcel commons-logging jakarta-regexp java_cup xalan xerces; do ${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar
done
for i in activation bcel commons-logging jakarta-regexp \
java_cup junit mail xalan xerces; do
ln -s ../../java/`ls -l %{_datadir}/java/$i.jar | sed -e 's:.* -> ::'` \ ln -s ../../java/`ls -l %{_datadir}/java/$i.jar | sed -e 's:.* -> ::'` \
${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar ${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar
done done
%post -n ant-libs %post -n ant-libs
%{_sbindir}/javaconfig \ %{_sbindir}/javaconfig \
%{_libdir}/lib-org-apache-tools.so \ %{_libdir}/lib-org-apache-tools-ant.so \
%{_datadir}/java/ant.jar %{_libdir}/lib-org-apache-tools-ant-taskdefs-optional.so \
%{_libdir}/lib-org-apache-tools-bzip2.so \
%{_libdir}/lib-org-apache-tools-mail.so \
%{_libdir}/lib-org-apache-tools-tar.so \
%{_libdir}/lib-org-apache-tools-zip.so \
%{_datadir}/java/ant.jar \
%{_datadir}/java/ant-optional.jar
%postun -n ant-libs %postun -n ant-libs
%{_sbindir}/javaconfig \ %{_sbindir}/javaconfig \
%{_libdir}/lib-org-apache-tools.so \ %{_libdir}/lib-org-apache-tools-ant.so \
%{_datadir}/java/ant.jar %{_libdir}/lib-org-apache-tools-ant-taskdefs-optional.so \
%{_libdir}/lib-org-apache-tools-bzip2.so \
%{_libdir}/lib-org-apache-tools-mail.so \
%{_libdir}/lib-org-apache-tools-tar.so \
%{_libdir}/lib-org-apache-tools-zip.so \
%{_datadir}/java/ant.jar \
%{_datadir}/java/ant-optional.jar
# Prior to 1.5.2-20, %{_bindir}/ant was a symbolic link managed by # Prior to 1.5.2-20, %{_bindir}/ant was a symbolic link managed by
# javaconfig. This pair of trigger scripts stops older ant's %postun # javaconfig. This pair of trigger scripts stops older ant's %postun
@ -166,8 +182,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/org/apache/tools/* %{_includedir}/org/apache/tools/*
%changelog %changelog
* Tue Nov 11 2003 Gary Benson <gbenson@redhat.com> 1.5.2-22
- Install links to JAF, JavaMail and JUnit jarfiles for classic-ant.
- Build all optional tasks that we are able to.
* Thu Nov 6 2003 Gary Benson <gbenson@redhat.com> 1.5.2-21 * Thu Nov 6 2003 Gary Benson <gbenson@redhat.com> 1.5.2-21
- Enable use JavaMail in mail sending tasks. - Enable JavaMail in mail sending tasks.
- Enable the JUnit tasks. - Enable the JUnit tasks.
* Thu Sep 25 2003 Gary Benson <gbenson@redhat.com> 1.5.2-20 * Thu Sep 25 2003 Gary Benson <gbenson@redhat.com> 1.5.2-20

View File

@ -1,2 +1,2 @@
1989ee829001dba4e21a4efeff430167 apache-ant-1.5.2-src.tar.bz2 1989ee829001dba4e21a4efeff430167 apache-ant-1.5.2-src.tar.bz2
caa1c44c8682ee1fb6c240b70de29de5 rhug-jakarta-ant-20031106.tar.bz2 dbe61aeea6ed7feecbdf3d1493c8bb38 rhug-jakarta-ant-20031111.tar.bz2