diff --git a/.cvsignore b/.cvsignore index c42b3bf..adfcbc2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ apache-ant-1.5.2-src.tar.bz2 -rhug-jakarta-ant-20031111.tar.bz2 +rhug-jakarta-ant-20031215.tar.bz2 diff --git a/ant.spec b/ant.spec index cf70c16..0b60320 100644 --- a/ant.spec +++ b/ant.spec @@ -1,73 +1,81 @@ -%define rhugversion 20031111 +%define rhugversion 20031215 %define rhugsource1 apache-%{name}-%{version} upstream %define rhugpatches 6 Summary: Build tool for Java applications Name: ant Version: 1.5.2 -Release: 23 +Release: 24.1 URL: http://ant.apache.org/ Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2 Source1: apache-%{name}-%{version}-src.tar.bz2 Source2: ant.conf Source3: README.anthome -Patch1: %{name}-1.5.2-release.patch -Patch2: %{name}-1.5.2-buildclasspath.patch -Patch3: %{name}-1.5.2-jarname.patch -Patch5: %{name}-1.5.2-hammer.patch -Patch6: %{name}-1.5.2-interpreter.patch -Patch7: %{name}-1.5.2-bz104986.patch -Patch8: %{name}-1.5.2-gcj-ssa.patch +Patch1: %{name}-rhjpp.patch +Patch6: %{name}-interpreter.patch +Patch7: %{name}-bz104986.patch +Patch8: %{name}-gcj34.patch License: Apache Software License Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: gcc-c++-ssa -BuildPrereq: gcc-java-ssa >= 3.5ssa-0.20030801.34 -BuildPrereq: xerces-j >= 2.2.1-10 -BuildPrereq: commons-logging >= 1.0.2-12 -BuildPrereq: jakarta-regexp >= 1.2-12 -BuildPrereq: xalan-j >= 2.4.1-9 -BuildPrereq: bcel >= 5.0-10 -BuildPrereq: jaf -BuildPrereq: javamail -BuildPrereq: junit -Requires: gcc-java-ssa >= 3.5ssa-0.20030801.34 -Requires: xerces-j >= 2.2.1-10 -Requires: commons-logging >= 1.0.2-12 -Requires: jakarta-regexp >= 1.2-12 -Requires: xalan-j >= 2.4.1-9 -Requires: bcel >= 5.0-10 -Requires: jaf -Requires: javamail -Requires: junit -Requires: ant-libs = %{version}-%{release} -ExclusiveArch: i386 x86_64 ppc ia64 +BuildPrereq: gcc34-c++ +BuildPrereq: gcc34-java +BuildPrereq: xerces-j >= 2.2.1-12 +BuildPrereq: commons-logging >= 1.0.2-13 +BuildPrereq: jakarta-regexp >= 1.2-13 +BuildPrereq: xalan-j >= 2.4.1-12 +BuildPrereq: bcel >= 5.0-11 +BuildPrereq: jaf >= 20030319-2 +BuildPrereq: javamail >= 20031006-2 +BuildPrereq: junit >= 3.8.1-2 +Requires: gcc34-java +Requires: xerces-j >= 2.2.1-12 +Requires: commons-logging >= 1.0.2-13 +Requires: jakarta-regexp >= 1.2-13 +Requires: xalan-j >= 2.4.1-12 +Requires: bcel >= 5.0-11 +Requires: jaf >= 20030319-2 +Requires: javamail >= 20031006-2 +Requires: junit >= 3.8.1-2 +Requires: ant-core = %{version}-%{release} %description Ant is a platform-independant build tool for Java applications that is used by Apache Jakarta and XML projects. -%package libs -Summary: The shared libraries used by Ant. +%package core +Summary: The core classes required by Ant Group: System Environment/Libraries Prereq: redhat-java-rpm-scripts >= 1.0.2-2 -Requires: libgcj-ssa >= 3.5ssa-0.20030801.34 -Requires: xerces-j >= 2.2.1-10 -Requires: commons-logging >= 1.0.2-12 -Requires: jakarta-regexp >= 1.2-12 -Requires: xalan-j >= 2.4.1-9 -Requires: bcel >= 5.0-10 -Requires: jaf -Requires: javamail -Requires: junit - -%description libs -The ant-libs package contains the libraries required by Ant. +Requires: libgcj34 +Requires: xerces-j >= 2.2.1-12 +Requires: commons-logging >= 1.0.2-13 +Requires: jakarta-regexp >= 1.2-13 +Requires: xalan-j >= 2.4.1-12 +Requires: bcel >= 5.0-11 +Requires: jaf >= 20030319-2 +Requires: javamail >= 20031006-2 + +%description core +The core classes required by Ant. + +%package optional +Summary: Optional tasks for Ant +Group: System Environment/Libraries +Prereq: redhat-java-rpm-scripts >= 1.0.2-2 +Requires: libgcj34 +Requires: xerces-j >= 2.2.1-12 +Requires: xalan-j >= 2.4.1-12 +Requires: junit >= 3.8.1-2 +Requires: ant-core = %{version}-%{release} + +%description optional +Optional tasks for Ant. %package devel Summary: CNI headers for developing Ant applications Group: Development/Libraries -Requires: ant-libs = %{version}-%{release} +Requires: ant-core = %{version}-%{release} %description devel The ant-devel package contains the headers required to develop @@ -76,13 +84,10 @@ Cygnus Native Interface (CNI) extensions that use Ant. %prep %setup -q -a 1 mv %{rhugsource1} -%patch1 -p0 -b .release -%patch2 -p0 -b .buildclasspath -%patch3 -p0 -b .jarname -%patch5 -p0 -b .hammer -%patch6 -p1 -b .interpreter +%patch1 -p0 -b .rhjpp +%patch6 -p0 -b .interpreter %patch7 -p0 -b .bz104986 -%patch8 -p0 -b .gcj-ssa +%patch8 -p0 -b .gcj34 mv ChangeLog ChangeLog.rhug mv TODO TODO.rhug for f in version.txt defaultManifest.mf; do @@ -93,19 +98,11 @@ for f in version.txt defaultManifest.mf; do done %build -%ifarch x86_64 ia64 -# 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. -CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa GCJFLAGS="-g -O0" \ -./configure --disable-static --prefix=%{_prefix} --libdir=%{_libdir} -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/FixCRLF.lo \ - upstream/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.lo -# End of Hack -%endif -CC=gcc-ssa CXX=g++-ssa GCJ=gcj-ssa GCJH=gcjh-ssa \ -./configure --disable-static --prefix=%{_prefix} --libdir=%{_libdir} +CC=gcc34 CXX=g++34 GCJ=gcj34 GCJH=gcjh34 \ +./configure \ + --disable-static \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} make %install @@ -131,36 +128,37 @@ for i in activation bcel commons-logging jakarta-regexp \ ${RPM_BUILD_ROOT}%{_datadir}/ant/lib/$i.jar done -%post -n ant-libs +%post core %{_sbindir}/javaconfig \ %{_libdir}/lib-org-apache-tools-ant.so \ - %{_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 + %{_datadir}/java/ant.jar -%postun -n ant-libs +%postun core %{_sbindir}/javaconfig \ %{_libdir}/lib-org-apache-tools-ant.so \ - %{_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 + %{_datadir}/java/ant.jar -# 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 -# scripts from choking on the new non-symbolic-link binary. -%triggerun -- ant < 1.5.2-20 -mv -f %{_bindir}/ant %{_bindir}/ant.tmp +%post optional +%{_sbindir}/javaconfig \ + %{_libdir}/lib-org-apache-tools-ant-taskdefs-optional.so \ + %{_libdir}/lib-org-apache-tools-ant-types-optional.so \ + %{_libdir}/lib-org-apache-tools-ant-util-optional.so \ + %{_datadir}/java/ant-optional.jar -%triggerpostun -- ant < 1.5.2-20 -mv -f %{_bindir}/ant.tmp %{_bindir}/ant +%postun optional +%{_sbindir}/javaconfig \ + %{_libdir}/lib-org-apache-tools-ant-taskdefs-optional.so \ + %{_libdir}/lib-org-apache-tools-ant-types-optional.so \ + %{_libdir}/lib-org-apache-tools-ant-util-optional.so \ + %{_datadir}/java/ant-optional.jar %clean rm -rf $RPM_BUILD_ROOT @@ -172,16 +170,51 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/ant -%files libs +%files core +%defattr(-,root,root) +%{_libdir}/lib-org-apache-tools-ant-%{version}.so +%{_libdir}/lib-org-apache-tools-bzip2-%{version}.so +%{_libdir}/lib-org-apache-tools-mail-%{version}.so +%{_libdir}/lib-org-apache-tools-tar-%{version}.so +%{_libdir}/lib-org-apache-tools-zip-%{version}.so +%{_datadir}/java/ant-%{version}.jar + +%files optional %defattr(-,root,root) -%{_libdir}/*.so -%{_datadir}/java/*.jar +%{_libdir}/lib-org-apache-tools-ant-taskdefs-optional-%{version}.so +%{_libdir}/lib-org-apache-tools-ant-types-optional-%{version}.so +%{_libdir}/lib-org-apache-tools-ant-util-optional-%{version}.so +%{_datadir}/java/ant-optional-%{version}.jar %files devel %defattr(-,root,root) %{_includedir}/org/apache/tools/* %changelog +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 18 2004 Gary Benson 1.5.2-24 +- Rebuild for Fedora. + +* Tue Feb 17 2004 Gary Benson +- Move the 'interpreter is gij' logic deeper (#113699). + +* Mon Feb 2 2004 Gary Benson +- Pick up xerces-j's XML libraries from their new location. + +* Mon Dec 22 2003 Gary Benson +- Split ant-libs into -core and -optional subpackages. + +* Mon Dec 15 2003 Gary Benson +- Apply hammer multilib fix to all multilib archs. +- Correctly link local libraries on hammer. + +* Fri Dec 12 2003 Gary Benson +- Upgraded to fluorinated RHUG tarball. +- Moved all optional stuff from lib-org-apache-tools-ant.so. +- Moved TraXLiaison from ant-optional.jar to ant.jar. + * Wed Nov 12 2003 Gary Benson 1.5.2-23 - Rebuild to fix linking on hammer. diff --git a/sources b/sources index f4c8024..30bf1c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1989ee829001dba4e21a4efeff430167 apache-ant-1.5.2-src.tar.bz2 -dbe61aeea6ed7feecbdf3d1493c8bb38 rhug-jakarta-ant-20031111.tar.bz2 +15b49c344b71d7c6fb049359ccbc54a4 rhug-jakarta-ant-20031215.tar.bz2