From 1f6a842abb470e9df1be283957288df04c6636d9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 08:07:57 +0000 Subject: import rh-java-common-ant-1.9.2-9.24.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a3585a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/apache-ant-1.9.2-src.tar.bz2 diff --git a/.rh-java-common-ant.metadata b/.rh-java-common-ant.metadata new file mode 100644 index 0000000..2404841 --- /dev/null +++ b/.rh-java-common-ant.metadata @@ -0,0 +1 @@ +566a0c7f2a19bb8f08484c81ab416a881e357df8 SOURCES/apache-ant-1.9.2-src.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-SCL-ize-ant-script.patch b/SOURCES/0001-SCL-ize-ant-script.patch new file mode 100644 index 0000000..c484a02 --- /dev/null +++ b/SOURCES/0001-SCL-ize-ant-script.patch @@ -0,0 +1,75 @@ +From bd27d06d2d72f406665f6423ccc71c88f8b50a50 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 13 Feb 2014 14:16:31 +0100 +Subject: [PATCH] SCL-ize ant script + +--- + src/script/ant | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/src/script/ant b/src/script/ant +index b5ed5be..e492f8c 100644 +--- a/src/script/ant ++++ b/src/script/ant +@@ -45,9 +45,9 @@ if $no_config ; then + usejikes=$use_jikes_default + else + # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) +- if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then +- if [ -f "/etc/ant.conf" ] ; then +- . /etc/ant.conf ++ if [ -z "$ANT_HOME" -o "$ANT_HOME" = "@DATADIR@/ant" ]; then ++ if [ -f "@CONFDIR@/ant.conf" ] ; then ++ . @CONFDIR@/ant.conf + fi + fi + +@@ -70,8 +70,8 @@ fi + + # Setup Java environment in rpm mode + if $rpm_mode ; then +- if [ -f /usr/share/java-utils/java-functions ] ; then +- . /usr/share/java-utils/java-functions ++ if [ -f @DATADIR@/java-utils/java-functions ] ; then ++ . @DATADIR@/java-utils/java-functions + set_jvm + set_javacmd + fi +@@ -166,12 +166,12 @@ fi + # is discouraged as it is not java-version safe. A user should + # request optional jars and their dependencies via the OPT_JAR_LIST + # variable +-if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then +- LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" ++if $rpm_mode && [ -x @BINDIR@/build-classpath ] ; then ++ LOCALCLASSPATH="$(@BINDIR@/build-classpath ant/ant ant/ant-launcher xerces-j2 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 ++ for file in @CONFDIR@/ant.d/*; do + if [ -f "$file" ]; then + case "$file" in + *~) ;; +@@ -189,7 +189,7 @@ if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then + + # 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)" ++ _OPTCLASSPATH="$(@BINDIR@/build-classpath $OPT_JAR_LIST 2> /dev/null)" + if [ -n "$_OPTCLASSPATH" ] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:$_OPTCLASSPATH" + fi +@@ -278,7 +278,8 @@ if $show_help ; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' + echo 'Script Options:' + echo ' --help, --h print this message and ant help' +- echo ' --noconfig suppress sourcing of /etc/ant.conf,' ++ echo ' --noconfig suppress sourcing of' ++ echo ' @CONFDIR@/ant.conf,' + echo ' $HOME/.ant/ant.conf, and $HOME/.antrc' + echo ' configuration files' + echo ' --usejikes enable use of jikes by default, unless' +-- +1.8.4.2 + diff --git a/SOURCES/apache-ant-1.8.ant.conf b/SOURCES/apache-ant-1.8.ant.conf new file mode 100644 index 0000000..0d71ea3 --- /dev/null +++ b/SOURCES/apache-ant-1.8.ant.conf @@ -0,0 +1,20 @@ +# ant.conf (Ant 1.8.x) +# JPackage Project + +# Validate --noconfig setting in case being invoked +# from pre Ant 1.6.x environment +if [ -z "$no_config" ] ; then + no_config=true +fi + +# Setup ant configuration +if $no_config ; then + # Disable RPM layout + rpm_mode=false +else + # Use RPM layout + rpm_mode=true + + # ANT_HOME for rpm layout + ANT_HOME=@DATADIR@/ant +fi diff --git a/SOURCES/apache-ant-class-path-in-manifest.patch b/SOURCES/apache-ant-class-path-in-manifest.patch new file mode 100644 index 0000000..7fa97e9 --- /dev/null +++ b/SOURCES/apache-ant-class-path-in-manifest.patch @@ -0,0 +1,13 @@ +--- build.xml.orig 2012-02-29 13:29:12.000000000 +0200 ++++ build.xml 2012-02-29 13:31:36.787937053 +0200 +@@ -728,10 +728,6 @@ + + + +- +- +- + + + diff --git a/SPECS/ant.spec b/SPECS/ant.spec new file mode 100644 index 0000000..cd8b825 --- /dev/null +++ b/SPECS/ant.spec @@ -0,0 +1,1246 @@ +%global pkg_name ant +%{?scl:%scl_package %{pkg_name}} +%{?java_common_find_provides_and_requires} + +# Copyright (c) 2000-2008, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%bcond_without tests +%bcond_without javadoc + +%global ant_home %{_datadir}/ant +%global major_version 1.8 + +Name: %{?scl_prefix}%{pkg_name} +Version: 1.9.2 +Release: 9.24%{?dist} +Epoch: 0 +Summary: Build tool for java +Summary(it): Tool per la compilazione di programmi java +Summary(fr): Outil de compilation pour java +License: ASL 2.0 +URL: http://ant.apache.org/ +Source0: http://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +Source2: apache-ant-%{major_version}.ant.conf + +# Fix some places where copies of classes are included in the wrong jarfiles +Patch4: apache-ant-class-path-in-manifest.patch + +Patch5: 0001-SCL-ize-ant-script.patch + +BuildRequires: %{?scl_prefix}javapackages-tools +BuildRequires: %{?scl_prefix}ant +BuildRequires: %{?scl_prefix}ant-junit +BuildRequires: %{?scl_prefix}junit +BuildRequires: %{?scl_prefix}xalan-j2 +BuildRequires: %{?scl_prefix}xerces-j2 +BuildRequires: %{?scl_prefix}xml-commons-apis + +Requires: %{?scl_prefix}javapackages-tools +Requires: perl +Requires: python +Requires: %{?scl_prefix}xerces-j2 +Requires: %{?scl_prefix}xml-commons-apis + + +BuildArch: noarch + +%description +Ant is a platform-independent build tool for java. It's used by apache +jakarta and xml projects. + +%description -l fr +Ant est un outil de compilation multi-plateformes pour java. Il est +utilisé par les projets apache-jakarta et apache-xml. + +%description -l it +Ant e' un tool indipendente dalla piattaforma creato per faciltare la +compilazione di programmi java. +Allo stato attuale viene utilizzato dai progetti apache jakarta ed +apache xml. + +%package jmf +Summary: Optional jmf tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description jmf +Optional jmf tasks for %{pkg_name}. + +%description jmf -l fr +Taches jmf optionelles pour %{pkg_name}. + +%package swing +Summary: Optional swing tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} + +%description swing +Optional swing tasks for %{pkg_name}. + +%description swing -l fr +Taches swing optionelles pour %{pkg_name}. + +%package antlr +Summary: Optional antlr tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}antlr-tool +BuildRequires: %{?scl_prefix}antlr-tool + +%description antlr +Optional antlr tasks for %{pkg_name}. + +%description antlr -l fr +Taches antlr optionelles pour %{pkg_name}. + +%package apache-bsf +Summary: Optional apache bsf tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}bsf +Requires: rhino +BuildRequires: %{?scl_prefix}bsf + +%description apache-bsf +Optional apache bsf tasks for %{pkg_name}. + +%description apache-bsf -l fr +Taches apache bsf optionelles pour %{pkg_name}. + +%package apache-resolver +Summary: Optional apache resolver tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}xml-commons-resolver +BuildRequires: %{?scl_prefix}xml-commons-resolver + +%description apache-resolver +Optional apache resolver tasks for %{pkg_name}. + +%description apache-resolver -l fr +Taches apache resolver optionelles pour %{pkg_name}. + +%package commons-logging +Summary: Optional commons logging tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}apache-commons-logging +BuildRequires: %{?scl_prefix}apache-commons-logging + +%description commons-logging +Optional commons logging tasks for %{pkg_name}. + +%description commons-logging -l fr +Taches commons logging optionelles pour %{pkg_name}. + +%package commons-net +Summary: Optional commons net tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}apache-commons-net +BuildRequires: %{?scl_prefix}apache-commons-net + +%description commons-net +Optional commons net tasks for %{pkg_name}. + +%description commons-net -l fr +Taches commons net optionelles pour %{pkg_name}. + +# Disable because we don't ship the dependencies +%if 0 +%package jai +Summary: Optional jai tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix_maven}jai +BuildRequires: %{?scl_prefix_maven}jai + +%description jai +Optional jai tasks for %{pkg_name}. + +%description jai -l fr +Taches jai optionelles pour %{pkg_name}. +%endif + +%package apache-bcel +Summary: Optional apache bcel tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}bcel +BuildRequires: %{?scl_prefix}bcel + +%description apache-bcel +Optional apache bcel tasks for %{pkg_name}. + +%description apache-bcel -l fr +Taches apache bcel optionelles pour %{pkg_name}. + +%package apache-log4j +Summary: Optional apache log4j tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}log4j +BuildRequires: %{?scl_prefix}log4j + +%description apache-log4j +Optional apache log4j tasks for %{pkg_name}. + +%description apache-log4j -l fr +Taches apache log4j optionelles pour %{pkg_name}. + +%package apache-oro +Summary: Optional apache oro tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}jakarta-oro +BuildRequires: %{?scl_prefix}jakarta-oro + +%description apache-oro +Optional apache oro tasks for %{pkg_name}. + +%description apache-oro -l fr +Taches apache oro optionelles pour %{pkg_name}. + +%package apache-regexp +Summary: Optional apache regexp tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}regexp +BuildRequires: %{?scl_prefix}regexp + +%description apache-regexp +Optional apache regexp tasks for %{pkg_name}. + +%description apache-regexp -l fr +Taches apache regexp optionelles pour %{pkg_name}. + +%package apache-xalan2 +Summary: Optional apache xalan2 tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}regexp +BuildRequires: %{?scl_prefix}regexp +Requires: %{?scl_prefix}xalan-j2 + +%description apache-xalan2 +Optional apache xalan2 tasks for %{pkg_name}. + +%description apache-xalan2 -l fr +Taches apache xalan2 optionelles pour %{pkg_name}. + +%package javamail +Summary: Optional javamail tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}javamail >= 0:1.2-5jpp +BuildRequires: %{?scl_prefix}javamail >= 0:1.2-5jpp + +%description javamail +Optional javamail tasks for %{pkg_name}. + +%description javamail -l fr +Taches javamail optionelles pour %{pkg_name}. + +%package jdepend +Summary: Optional jdepend tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}jdepend +BuildRequires: %{?scl_prefix}jdepend + +%description jdepend +Optional jdepend tasks for %{pkg_name}. + +%description jdepend -l fr +Taches jdepend optionelles pour %{pkg_name}. + +%package jsch +Summary: Optional jsch tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}jsch +BuildRequires: %{?scl_prefix}jsch + +%description jsch +Optional jsch tasks for %{pkg_name}. + +%description jsch -l fr +Taches jsch optionelles pour %{pkg_name}. + +%package junit +Summary: Optional junit tasks for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}junit +Requires: %{?scl_prefix}xalan-j2 + +%description junit +Optional junit tasks for %{pkg_name}. + +%description junit -l fr +Taches junit optionelles pour %{pkg_name}. + +%package testutil +Summary: Test utility classes for %{pkg_name} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{?scl_prefix}junit + +%description testutil +Test utility tasks for %{pkg_name}. + +%package manual +Summary: Manual for %{pkg_name} +# tutorial-tasks-filesets-properties.zip contains ASL 1.1 files +License: ASL 2.0 and ASL 1.1 +Requires: %{?scl_prefix}runtime + +%description manual +Documentation for %{pkg_name}. + +%description manual -l it +Documentazione di %{pkg_name}. + +%description manual -l fr +Documentation pour %{pkg_name}. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +Javadoc for %{pkg_name}. + +%description javadoc -l fr +Javadoc pour %{pkg_name}. + +# ----------------------------------------------------------------------------- + +%prep +%setup -q -n apache-ant-%{version} +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +#Fixup version +find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// + +# Fix class-path-in-manifest rpmlint warning +%patch4 +%patch5 -p1 +sed -i -e 's|@DATADIR@|%{_datadir}|' -e 's|@BINDIR@|%{_bindir}|' -e 's|@CONFDIR@|%{_sysconfdir}|' src/script/ant + +# clean jar files +find . -name "*.jar" | xargs -t rm + +# failing testcases. TODO see why +rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \ + src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \ + src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ + src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ + src/tests/junit/org/apache/tools/mail/MailMessageTest.java + +#install jars +build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis + +# Fix file-not-utf8 rpmlint warning +iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 +mv KEYS.utf8 KEYS +iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 +mv LICENSE.utf8 LICENSE +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +%{ant} jars test-jar + +%if %with javadoc +export CLASSPATH=$(build-classpath antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xerces-j2 xml-commons-apis) +%{ant} javadocs +%endif + +#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. +rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar +# ----------------------------------------------------------------------------- +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +# ANT_HOME and subdirs +mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin} + +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name} +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} + +for jar in build/lib/*.jar +do + # Make sure that installed JARs are not empty + jar tf ${jar} | egrep -q *.class + + jarname=$(basename $jar .jar) + pomname="JPP.%{pkg_name}-${jarname}.pom" + + #instal jar + install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}/${jarname}.jar + # jar aliases + ln -sf ../../java/%{pkg_name}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar + + #bootstrap does not have a pom + [ $jarname == ant-bootstrap ] && continue + + # add backward compatibility for nodeps jar that is now part of main + # jar + alias= + [ $jarname == ant ] && alias=org.apache.ant:ant-nodeps + + #install pom + install -p -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname} + %add_maven_depmap ${pomname} %{pkg_name}/${jarname}.jar -a "${alias}" -f ${jarname/ant-/} +done + +for mod in ant ant-bootstrap ant-launcher; do + ln -sf %{pkg_name}/${mod}.jar $RPM_BUILD_ROOT%{_javadir} +done + +#ant-parent pom +install -p -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}-parent.pom +%add_maven_depmap JPP-%{pkg_name}-parent.pom + +# scripts: remove dos and os/2 scripts +rm -f src/script/*.bat +rm -f src/script/*.cmd + +# XSLs +cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc + +# install everything else +mkdir -p $RPM_BUILD_ROOT%{_bindir} +cp -p src/script/* $RPM_BUILD_ROOT%{_bindir} +ln -sf %{_bindir}/ant $RPM_BUILD_ROOT%{ant_home}/bin/ +ln -sf %{_bindir}/antRun $RPM_BUILD_ROOT%{ant_home}/bin/ + +# default ant.conf +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.conf +sed -i -e 's|@DATADIR@|%{_datadir}|' $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.conf + +# rhino.jar needs to be symlinked from base to make it resolvable in SCL. +ln -s /usr/share/java/rhino.jar $RPM_BUILD_ROOT%{_javadir}/bsf-rhino.jar + +# OPT_JAR_LIST fragments +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d +echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/jmf +echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/swing +echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/antlr +echo "bsf ant/ant-apache-bsf bsf-rhino" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-bsf +echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-resolver +echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/commons-logging +echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/commons-net +#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{pkg_name}.d/jai +echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-bcel +echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-log4j +echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-oro +echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-regexp +echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/apache-xalan2 +echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/javamail +echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/jdepend +echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/jsch +echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/junit +echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/junit4 +echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{pkg_name}.d/testutil + +%if %with javadoc +# javadoc +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%endif + +# fix link between manual and javadoc +(cd manual; ln -sf %{_javadocdir}/%{name} api) +%{?scl:EOF} + +%if %with tests +%check +%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} +set -e -x +%{ant} test +%{?scl:EOF} +%endif + +%files -f .mfiles +%files -f .mfiles-ant +%files -f .mfiles-launcher +%doc KEYS LICENSE NOTICE README WHATSNEW +%config(noreplace) %{_sysconfdir}/%{pkg_name}.conf +%attr(0755,root,root) %{_bindir}/ant +%attr(0755,root,root) %{_bindir}/antRun +%attr(0755,root,root) %{_bindir}/*.pl +%attr(0755,root,root) %{_bindir}/*.py* +%{_javadir}/%{pkg_name}.jar +%{_javadir}/%{pkg_name}-launcher.jar +%{_javadir}/%{pkg_name}-bootstrap.jar +%dir %{_javadir}/%{pkg_name} +%{_javadir}/%{pkg_name}/%{pkg_name}-bootstrap.jar +%dir %{ant_home} +%dir %{ant_home}/bin +%{ant_home}/bin/ant +%{ant_home}/bin/antRun +%dir %{ant_home}/etc +%{ant_home}/etc/ant-update.xsl +%{ant_home}/etc/changelog.xsl +%{ant_home}/etc/coverage-frames.xsl +%{ant_home}/etc/mmetrics-frames.xsl +%{ant_home}/etc/log.xsl +%{ant_home}/etc/tagdiff.xsl +%{ant_home}/etc/junit-frames-xalan1.xsl +%{ant_home}/etc/common2master.xsl +%{ant_home}/etc/printFailingTests.xsl +%dir %{ant_home}/lib +%{ant_home}/lib/%{pkg_name}.jar +%{ant_home}/lib/%{pkg_name}-launcher.jar +%{ant_home}/lib/%{pkg_name}-bootstrap.jar +%dir %{_sysconfdir}/%{pkg_name}.d + +%files jmf -f .mfiles-jmf +%{ant_home}/lib/%{pkg_name}-jmf.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/jmf + +%files swing -f .mfiles-swing +%{ant_home}/lib/%{pkg_name}-swing.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/swing + +%files antlr -f .mfiles-antlr +%{ant_home}/lib/%{pkg_name}-antlr.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/antlr + +%files apache-bsf -f .mfiles-apache-bsf +%{ant_home}/lib/%{pkg_name}-apache-bsf.jar +%{_javadir}/bsf-rhino.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-bsf + +%files apache-resolver -f .mfiles-apache-resolver +%{ant_home}/lib/%{pkg_name}-apache-resolver.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-resolver + +%files commons-logging -f .mfiles-commons-logging +%defattr(-,root,root,-) +%{ant_home}/lib/%{pkg_name}-commons-logging.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/commons-logging + +%files commons-net -f .mfiles-commons-net +%{ant_home}/lib/%{pkg_name}-commons-net.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/commons-net + +# Disable as we dont ship the dependencies +%if 0 +%files jai -f .mfiles-jai +%{ant_home}/lib/%{pkg_name}-jai.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/jai +%endif + +%files apache-bcel -f .mfiles-apache-bcel +%{ant_home}/lib/%{pkg_name}-apache-bcel.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-bcel + +%files apache-log4j -f .mfiles-apache-log4j +%{ant_home}/lib/%{pkg_name}-apache-log4j.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-log4j + +%files apache-oro -f .mfiles-apache-oro +%{ant_home}/lib/%{pkg_name}-apache-oro.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-oro +%{ant_home}/etc/maudit-frames.xsl + +%files apache-regexp -f .mfiles-apache-regexp +%{ant_home}/lib/%{pkg_name}-apache-regexp.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-regexp + +%files apache-xalan2 -f .mfiles-apache-xalan2 +%{ant_home}/lib/%{pkg_name}-apache-xalan2.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/apache-xalan2 + +%files javamail -f .mfiles-javamail +%{ant_home}/lib/%{pkg_name}-javamail.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/javamail + +%files jdepend -f .mfiles-jdepend +%{ant_home}/lib/%{pkg_name}-jdepend.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/jdepend +%{ant_home}/etc/jdepend.xsl +%{ant_home}/etc/jdepend-frames.xsl + +%files jsch -f .mfiles-jsch +%{ant_home}/lib/%{pkg_name}-jsch.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/jsch + +%files junit -f .mfiles-junit +%files junit -f .mfiles-junit4 +%{ant_home}/lib/%{pkg_name}-junit.jar +%{ant_home}/lib/%{pkg_name}-junit4.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/junit +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/junit4 +%{ant_home}/etc/junit-frames.xsl +%{ant_home}/etc/junit-noframes.xsl + +%files testutil -f .mfiles-testutil +%{ant_home}/lib/%{pkg_name}-testutil.jar +%config(noreplace) %{_sysconfdir}/%{pkg_name}.d/testutil + +%files manual +%doc LICENSE NOTICE +%doc manual/* + +%if %with javadoc +%files javadoc +%doc LICENSE NOTICE +%{_javadocdir}/%{name} +%endif + +# ----------------------------------------------------------------------------- + +%changelog +* Mon Jan 19 2015 Michal Srb - 0:1.9.2-9.24 +- Fix LOCALCLASSPATH + +* Thu Jan 15 2015 Mikolaj Izdebski - 0:1.9.2-9.23 +- Stop reading ant.d files from maven30 + +* Wed Jan 14 2015 Mikolaj Izdebski - 0:1.9.2-9.22 +- Add requires on SCL filesystem package + +* Tue Jan 13 2015 Mikolaj Izdebski - 0:1.9.2-9.21 +- Add rhino to bsf classpath + +* Tue Jan 13 2015 Michael Simacek - 0:1.9.2-9.21 +- Mass rebuild 2015-01-13 + +* Mon Jan 12 2015 Mikolaj Izdebski - 0:1.9.2-9.20 +- Temporarly read ant.d from maven30 + +* Fri Jan 09 2015 Michal Srb - 0:1.9.2-9.19 +- Mass rebuild 2015-01-09 + +* Tue Dec 16 2014 Mat Booth - 0:1.9.2-9.18 +- Re-enable tests + +* Tue Dec 16 2014 Mat Booth - 0:1.9.2-9.17 +- Make SCL-isation patches more generic +- Bootstrap without tests + +* Tue Dec 16 2014 Mikolaj Izdebski - 0:1.9.2-9.16 +- Migrate requires and build-requires to rh-java-common + +* Mon Dec 15 2014 Mikolaj Izdebski - 0:1.9.2-9.15 +- Mass rebuild 2014-12-15 + +* Mon Dec 15 2014 Mikolaj Izdebski - 0:1.9.2-9.14 +- Rebuild for rh-java-common collection + +* Mon May 26 2014 Mikolaj Izdebski - 0:1.9.2-9.13 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 0:1.9.2-9.12 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.9.2-9.11 +- Use xerces-j2 directly instead of through jaxp_parser_impl + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.9.2-9.10 +- Mass rebuild 2014-02-18 + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.9.2-9.9 +- Remove requires on java + +* Mon Feb 17 2014 Mikolaj Izdebski - 0:1.9.2-9.8 +- Enable tests + +* Fri Feb 14 2014 Mikolaj Izdebski - 0:1.9.2-9.7 +- Fix ant config location in ant script + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.9.2-9.6 +- SCL-ize requires and build-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.9.2-9.5 +- Rebuild to regenerate auto-requires + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.9.2-9.4 +- SCL-ize ant script + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.9.2-9.3 +- Rebuild to fix auto-requires +- Skip tests for now + +* Thu Feb 13 2014 Mikolaj Izdebski - 0:1.9.2-9.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 0:1.9.2-9.1 +- First maven30 software collection build + +* Tue Jan 21 2014 Stanislav Ochotnicky - 0:1.9.2-9 +- Fix license of manual subpackage +- Resolves: rhbz#1055629 + +* Fri Dec 27 2013 Daniel Mach - 01.9.2-8 +- Mass rebuild 2013-12-27 + +* Thu Sep 12 2013 Mikolaj Izdebski - 0:1.9.2-7 +- Install Maven depmaps in appropriate subpackages +- Resolves: rhbz#996062 + +* Fri Aug 30 2013 Mikolaj Izdebski - 0:1.9.2-6 +- Fix antRun script +- Resolves: rhbz#675949 + +* Fri Aug 09 2013 Michal Srb - 0:1.9.1-6 +- Add missing BR/R: xerces-j2, xml-commons-apis + +* Thu Aug 08 2013 Michal Srb - 0:1.9.2-5 +- xerces-j2 and xml-commons-apis should be in classpath (Resolves: rhbz#994556) + +* Thu Aug 08 2013 Michal Srb - 0:1.9.2-4 +- Temporarily add xerces-j2 and xml-commons-apis to classpath, see #994556 + +* Fri Jul 26 2013 Mikolaj Izdebski - 0:1.9.2-3 +- Rebuilt to regenerate depmap files +- Resolves: rhbz#988797 + +* Thu Jul 25 2013 Stanislav Ochotnicky - 0:1.9.2-2 +- Update license after removal of W3C content upstream + +* Wed Jul 17 2013 Mikolaj Izdebski - 0:1.9.2-1 +- Update to upstream version 1.9.2 +- Remove usage of %%add_to_maven_depmap + +* Tue Jul 2 2013 Mikolaj Izdebski - 0:1.9.1-3 +- Remove arch-specific patch as ant is noarch now +- Remove bcond macro definitions (provided by rpm itself) +- Remove Group tags +- Update to current packaging guidelines +- Run tests in %%check instead of %%build +- Remove dependencies on xerces-j2 and xml-commons-apis, resolves: rhbz#838711 +- Convert %%global build_javadoc to conditional +- Remove bootstrap code, resolves: rhbz#915437 +- Fail the build if any of JARs is empty +- Skip running tests that fail on Koji, resolves: rhbz#979496 +- Merge scripts into main package, resolves: rhbz#798975 + +* Mon Jun 03 2013 Stanislav Ochotnicky - 0:1.9.1-2 +- Enable unit tests + +* Wed May 22 2013 Mikolaj Izdebski - 0:1.9.1-1 +- Update to upstream version 1.9.1 + +* Mon Apr 22 2013 Alexander Kurtakov 0:1.9.0-2 +- Drop a pile of old provider/requires/obsoletes that are no longer usable + and cause only problem if ant is scl-ized. + +* Mon Mar 11 2013 Michal Srb - 0:1.9.0-1 +- Update to upstream version 1.9.0 + +* Wed Feb 13 2013 Fedora Release Engineering - 0:1.8.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Tomas Radej - 0:1.8.4-5 +- Requires on jpackage-utils in javadoc +- Added LICENSE and NOTICE in manual subpackage + +* Thu Nov 22 2012 Jaromir Capik 0:1.8.4-4 +- Including LICENSE and NOTICE in the javadoc subpackage + +* Thu Nov 22 2012 Jaromir Capik 0:1.8.4-3 +- Fixing the license tag + +* Wed Jul 18 2012 Fedora Release Engineering - 0:1.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 15 2012 Alexander Kurtakov 0:1.8.4-1 +- Update to new upstream version. + +* Wed May 2 2012 Alexander Kurtakov 0:1.8.3-2 +- Use apache-commons-* instead of jakarta-commons-*. +- Drop xml-commons-apis-13 BR/R since it's no longer needed. + +* Wed Feb 29 2012 Alexander Kurtakov 0:1.8.3-1 +- Update to upstream 1.8.3 release. +- Drop old stuff. + +* Tue Feb 07 2012 Tomas Radej - 0:1.8.2-9 +- Added patch + +* Tue Feb 07 2012 Tomas Radej - 0:1.8.2-8 +- Removed checking for classpath duplicates +- Added ant-junit4.jar into %files and ant.d + +* Thu Jan 12 2012 Fedora Release Engineering - 0:1.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jul 6 2011 Alexander Kurtakov 0:1.8.2-6 +- Make scripts executable. +- Adapt to current guidelines. + +* Thu Mar 10 2011 Alexander Kurtakov 0:1.8.2-5 +- Fix xalan-j2 subpackage path. + +* Tue Feb 22 2011 Stanislav Ochotnicky - 0:1.8.2-4 +- Change oro to jakarta-oro in BR/R + +* Wed Feb 9 2011 Stanislav Ochotnicky - 0:1.8.2-3 +- Add backward compatible maven depmap for nodeps jar +- Revert define->global change (different semantic in rpm 4.9.X) + +* Mon Feb 07 2011 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Alexander Kurtakov 0:1.8.2-1 +- Update to new upstream version. +- Guidelines fixes. + +* Sun Nov 28 2010 Ville Skyttä - 0:1.8.1-9 +- Install javadocs into unversioned dir (#657879). + +* Tue Nov 23 2010 Stanislav Ochotnicky - 0:1.8.1-8 +- Fix pom filename (Resolves rhbz#655787) + +* Thu Oct 28 2010 Orion Poplawski 0:1.8.1-7 +- Build and package ant-testutil + +* Thu Oct 7 2010 Alexander Kurtakov 0:1.8.1-6 +- Remove jaf from the classpath. + +* Thu Oct 7 2010 Alexander Kurtakov 0:1.8.1-5 +- Drop gcj support. +- Drop jaf BR/R it is part of Java 5+. + +* Fri Oct 1 2010 Orion Poplawski 0:1.8.1-4 +- Move ant-trax Provides/Obsoletes to ant-nodeps + +* Thu Aug 26 2010 Orion Poplawski 0:1.8.1-3 +- Remove -SNAPSHOT from version + +* Wed Aug 25 2010 Alexander Kurtakov 0:1.8.1-2 +- Use global instead of define. +- Fix parent pom install. + +* Mon Aug 16 2010 Orion Poplawski 0:1.8.1-1 +- Update to ant 1.8.1 +- Update no-test-jar patch +- Update class-path-in-manifest patch +- Drop gnu-classpath patch +- Retire trax subpackage no longer shipped +- Add xalan2 subpackage and support for junitreport task +- Drop old jakarta jar aliases + +* Thu Aug 13 2009 Alexander Kurtakov 0:1.7.1-12 +- Fix compile with commons-net 2.0. + +* Fri Aug 7 2009 Orion Poplawski - 0:1.1.7-11 +- Add links to jar files into %%{ant_home} (Bug #179759) + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.7.1-10.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 0:1.7.1-9.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0:1.7.1-8.2 +- Rebuild for Python 2.6 + +* Wed Oct 1 2008 Tom "spot" Callaway 0:1.7.1-7.2 +- Exclude bogus perl(the) Requires +- Exclude bogus perl(oata), perl(examples) Provides + +* Fri Sep 26 2008 Permaine Cheung 0:1.7.1-7.1 +- Define with_gcj_support + +* Tue Sep 23 2008 Permaine Cheung 0:1.7.1-7 +- Update to 1.7.1 +- Fix some rpmlint issues + +* Tue Jul 15 2008 David Walluck 0:1.7.1-7 +- enable non-bootstrap + +* Tue Jul 15 2008 David Walluck 0:1.7.1-6 +- add ant-bootstrap jar if bootstrap is enabled +- enable jmf, swing, trax if bootstrap is enabled +- BuildRequires: jaxp_transform_impl +- BuildRequires: junit for non-bootstrap + +* Tue Jul 15 2008 David Walluck 0:1.7.1-5 +- enable ant-nodeps in bootstrap mode + +* Tue Jul 15 2008 David Walluck 0:1.7.1-4 +- remove junit for bootstrap + +* Tue Jul 15 2008 David Walluck 0:1.7.1-3 +- build as bootstrap + +* Tue Jul 15 2008 David Walluck 0:1.7.1-2 +- set rpm_mode=false by default + +* Thu Jul 10 2008 David Walluck 0:1.7.1-1 +- 1.7.1 +- update maven pom files +- rediff apache-ant-jars.patch +- rediff apache-ant-bz163689.patch +- add apache-ant-gnu-classpath.patch +- set rpm_mode=true in conf since the ant script handles the rest + +* Thu Jul 10 2008 David Walluck 0:1.7.0-3 +- add bootstrap mode +- replace some alternatives/virtual requires by explicit requires +- remove javadoc scriptlets +- fix GCJ support +- add workaround for xalan-j2 in %%{_sysconfdir}/%%{name}.d/trax +- version Obsoletes and add Provides +- remove Conflicts +- mark files in %%{_sysconfdir} as %%config(noreplace) + +* Thu Jul 03 2007 Ralph Apel - 0:1.7.0-2.jpp5 +- Add poms and depmap frags +- (B)R jpackage-utils >= 0:1.7.5 +- BR java-devel = 0:1.5.0 +- R java >= 0:1.5.0 + +* Wed Jun 20 2007 Fernando Nasser - 0:1.7.0-1jpp +- Upgrade to the final 1.7.0 + +* Thu Sep 21 2006 Will Tatam - 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 Aug 11 2006 Deepak Bhole - 0:1.6.5-2jpp +- Added conditional native compilation +- Added patch to fix jvm version detection +- Add missing requirements +- Synch with Fedora spec + +* Wed Nov 09 2005 Fernando Nasser - 0:1.6.5-1jpp +- Upgrade to 1.6.5 +- Incorporate the following changes: + From Gary Benson : +- 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 +- Removed apache-ant-1.6.2.patch. Incorporated upstream. + From David Walluck +- Add manifest-only package (mainly for eclipse) +- Add conflicts on j2sdk for Mandriva + +* Mon Nov 8 2004 Gary Benson - 0:1.6.2-3jpp +- Build OPT_JAR_LIST from files in /etc/ant.d. + +* Mon Sep 06 2004 Fernando Nasser - 0:1.6.2-2jpp +- Fix to backward compatibility symbolic links. + +* Wed Aug 17 2004 Fernando Nasser - 0:1.6.2-1jpp +- Update to Ant 1.6.2 + +* Thu Aug 05 2004 Fernando Nasser - 0:1.6.1-2jpp +- Remove incorrect noreplace option for ant.conf; it can't be used anymore + because the sub-packages update that file. +- Add patch to fix temp directory used for file containing large + command strings (> 4k) + +* Tue Jun 01 2004 Randy Watler - 0:1.6.1-1jpp +- Extend subpackage builds to update ant.conf + +* Tue Mar 23 2004 Randy Watler - 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} +- Remove os/2 scripts and set JAVA_HOME for build + +* Wed Feb 11 2004 Randy Watler - 0:1.6.0-1jpp +- Update to Ant 1.6.0 +- Break out optional/optional-full components +- Revise ant launch scripts and support ~/.ant/ant.conf configuration file +- Use --noconfig flag to bootstrap ant build and override existing jpp config +- Modify ant launcher to use ant.library.dir property to find extra jars +- Port changes made in ant launch script for 1.6.2 back into patches + +* Wed Aug 13 2003 Paul Nasrat - 0:1.5.4-2jpp +- remove bogus NoSource entries + +* Tue Aug 12 2003 Paul Nasrat - 0:1.5.4-1jpp +- Update to 1.5.4 +- JavaCC task fixed using merged upstream patches from ant HEAD + +* Mon May 5 2003 Ville Skyttä - 0:1.5.3-2jpp +- Fix non-versioned javadoc symlinking. + +* Tue Apr 22 2003 Ville Skyttä - 0:1.5.3-1jpp +- Update to 1.5.3. +- Remove runtime java-devel dependency. +- Add Epochs in all Provides and Requires. +- Include non-versioned javadoc symlink. +- Build without dependencies that are partially or completely missing from + JPackage 1.5 (oldbsf, xalan-j1, stylebook1.0b3). +- Add netcomponents to optional jar list in ant.conf. + +* Tue Apr 01 2003 Nicolas Mailhot - 1.5.2-13jpp +- ant-optional is optional (silly me) +- jaxp_transform is optional , do not require it +- epoch, correct jpackage-utils requires... + +* Fri Mar 21 2003 Nicolas Mailhot - 1.5.2-11jpp +- add an optional jar list as per Ville's suggestion + +* Thu Mar 20 2003 Nicolas Mailhot - 1.5.2-10jpp +- hopefully fix CLASSSPATH_OVERRIDE behaviour + +* Tue Mar 18 2003 Nicolas Mailhot - 1.5.2-7jpp +- for JPackage-utils 1.5 + +* Wed Mar 12 2003 Ville Skyttä - 1.5.2-5jpp +- Move ANT_HOME to /usr/share/ant. +- Don't special-case the lib dir for RPM layout any more, use ANT_HOME/lib. +- Install XSLs into ANT_HOME/etc. +- Call set_jvm by default in ant.conf. +- Provide ant-optional-clean (versioned) in ant-optional. +- Make ant-optional-full conflict with ant-optional-clean. +- Add version info to ant-optional provision in ant-optional-full. +- Built with Sun 1.4.1_02 javac (to get JDK 1.4 regex). + +* Tue Mar 11 2003 Henri Gomez 1.5.2-4jp +- changed provided /etc/ant.conf so that if usejikes is allready provided + it didn't set it. Which such modification if you want to disable + ant to use jikes even if jikes is set in /etc/ant.conf you'll just have + to do usejikes=false ant build.xml. + +* Mon Mar 10 2003 Henri Gomez 1.5.2-3jp +- rebuilt with IBM SDK 1.3.1 since there was zip corruption when built + with jikes 1.18 and IBM SDK 1.4. + +* Wed Mar 05 2003 Henri Gomez 1.5.2-2jp +- updated URL and source location + +* Wed Mar 05 2003 Henri Gomez 1.5.2-1jp +- 1.5.2 +- remove JDK 1.4 related patchs which are now included in ant 1.5.2 +- fix ant-optional-full pre/post install script (now remove correctly all + ant optional jars) +- Built with jikes 1.18 and IBM SDK 1.4 + +* Sat Feb 1 2003 Ville Skyttä - 1.5.1-8jpp +- Symlink a transformer into ANT_LIB for smoother experience on Java 1.3. +- Requires jaxp_transform_impl. +- Don't remove optional.jar symlinks on optional-full upgrade. +- Include Sun's 1.4 JSSE and JCE jars in runtime path, see + . +- Use jpackage-utils for setting JAVA_HOME when building. +- Built with Sun 1.4.1_01 javac. + +* Mon Jan 20 2003 David Walluck 1.5.1-7jpp +- oldbsf + +* Fri Dec 20 2002 Ville Skyttä - 1.5.1-6jpp +- Really get rid of automatic dependencies for the -scripts package. + +* Wed Dec 18 2002 Guillaume Rousse 1.5.1-5jpp +- scripts subpackages +- file-based manual dependencies, as packages doesn't have the same name on RedHat and Mandrake + +* Wed Dec 11 2002 Ville Skyttä - 1.5.1-4jpp +- Patched to allow easier use with Jikes and IBM's 1.4.0, see + for details. + +* Mon Oct 07 2002 Henri Gomez 1.5.1-3jpp +- new post script for optional-full since rpm didn't works as + expected and didn't set correct symlink for ant-optional.jar + +* Thu Oct 03 2002 Henri Gomez 1.5.1-2jpp +- really used JDK 1.4.1 to get JDK 1.4.x Regexp + +* Thu Oct 03 2002 Henri Gomez 1.5.1-1jpp +- ant 1.5.1 + +* Fri Jul 12 2002 Henri Gomez 1.5-5jpp +- ant script standard behaviour restored, ie ant/lib jars are taken + before CLASSPATH. You should define CLASSPATH_OVERRIDE env var to have + CLASSPATH before ant/lib jars +- applied ant script patch for cygwin (cygwin rpm users around ?) +- remove conflict in ant-optional-full, just put provides + +* Fri Jul 12 2002 Henri Gomez 1.5-4jpp +- fix a problem in xerces-j2 build by changing the way CLASSPATH is constructed: + first add jars found in CLASSPATH, then add xml-commons-apis, jaxp_parser_impl, + ant, ant-optional and finish with jars found in ant/lib. +- jpackage-utils is no more required (but recommanded :) +- ant-optional-full provides ant-optional +- fix link between manual and api (javadoc) + +* Thu Jul 11 2002 Henri Gomez 1.5-3jpp +- add missing symlink between optional-full.jar and optional.jar + +* Wed Jul 10 2002 Ville Skyttä 1.5-2jpp +- Requires jaxp_parser_impl, no longer jaxp_parser2 + (jaxp_parser_impl already requires xml-commons-apis). +- Use sed instead of bash 2 extension when symlinking. + +* Wed Jul 10 2002 Henri Gomez 1.5-1jpp +* ant 1.5 + +* Tue Jul 09 2002 Henri Gomez 1.5.Beta3-1jpp +- ant 1.5 beta 3 +- added bcel as required + +* Tue Jul 09 2002 Henri Gomez 1.4.1-14jpp +- added regexp to list of dependant packages + +* Tue Jul 09 2002 Henri Gomez 1.4.1-13jpp +- added optional-full which include all ant tasks, even those without + 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 + +* Tue May 07 2002 Guillaume Rousse 1.4.1-12jpp +- hardcoded distribution and vendor tag +- group tag again + +* Thu May 2 2002 Guillaume Rousse 1.4.1-11jpp +- no more jikes specific support in launch script +- source user prefs before configuration in launch script +- distribution tag +- group tag +- provided original script as documentation + +* Fri Apr 05 2002 Guillaume Rousse 1.4.1-10jpp +- used xalan-j1 instead of xalan-j2-compat + +* Mon Mar 11 2002 Guillaume Rousse 1.4.1-9jpp +- jaxp_parser2 support + +* Wed Feb 06 2002 Guillaume Rousse 1.4.1-8jpp +- netcomponents support + +* Sun Jan 27 2002 Guillaume Rousse 1.4.1-7jpp +- adaptation to new stylebook1.0b3 package +- stylebook is a dependency of optional package +- removed redundant dependencies +- launch script correction + +* Fri Jan 25 2002 Guillaume Rousse 1.4.1-6jpp +- cleaned manifest from class-path references +- section macro + +* Thu Jan 17 2002 Guillaume Rousse 1.4.1-5jpp +- versioned dir for javadoc +- no dependencies for manual and javadoc packages +- stricter dependency for optional package +- additional sources in individual archives +- upgraded launch script +- no more javadoc cross-linking +- additional requirement for optional package: xml-commons-apis, xalan-j2, xalan-j2-compat, jaf, javamail, & log4j + +* Sat Dec 1 2001 Guillaume Rousse 1.4.1-4jpp +- removed conditional build +- removed redundant BuildRequires +- ant-optional.jar in ant-optional package +- javadoc into javadoc package +- new launch script using functions library + +* Wed Nov 21 2001 Christian Zoffoli 1.4.1-3jpp +- readded Requires: oro junit stylebook-1.0b3 bsf rhino antlr to the main package +- corrected changelog release 1jpp-> 2jpp + +* Tue Nov 20 2001 Christian Zoffoli 1.4.1-2jpp +- conditional build +- removed packager tag +- new jpp extension +- added xalan 2.2.D13 support +- added BuildRequires: xalan-j2 >= 2.2.D13 +- removed Requires: oro junit stylebook-1.0b3 bsf rhino antlr + +* Mon Oct 15 2001 Guillaume Rousse 1.4.1-1jpp +- 1.4.1 + +* Sat Oct 6 2001 Guillaume Rousse 1.4-4jpp +- used original tarball + +* Sun Sep 30 2001 Guillaume Rousse 1.4-3jpp +- more macros + +* Wed Sep 26 2001 Guillaume Rousse 1.4-2jpp +- first unified release +- dropped explicit xalan-j2 requirement, as stylebook-1.0b3 already requires it +- added missing xalan-j1 compatibility classes +- s/jPackage/JPackage + +* Wed Sep 05 2001 Guillaume Rousse 1.4-1mdk +- 1.4 +- added xalan-j2 antlr bsf rhino to buildrequires and requires +- launch script cleanup + +* Tue Jul 31 2001 Guillaume Rousse 1.3-4mdk +- jaxp_parser symlink is now jaxp_parser.jar + +* Thu Jul 26 2001 Guillaume Rousse 1.3-3mdk +- used alternative jaxp_parser +- updated launch script + +* Sat Jun 23 2001 Guillaume Rousse 1.3-2mdk +- s/Copyright/License/ +- truncated description to 72 columns in spec +- updated launch script + +* Mon Jun 11 2001 Guillaume Rousse 1.3-1mdk +- 1.3 +- new versioning scheme +- compiled with oro, junit and stylebook support +- spec cleanup + +* Sat Mar 10 2001 Guillaume Rousse 1.2-9mdk +- vendor tag +- packager tag + +* Sat Feb 17 2001 Guillaume Rousse 1.2-8mdk +- spec cleanup +- corrected changelog +- changed description + +* Sun Feb 04 2001 Guillaume Rousse 1.2-7mdk +- launch script improvments (Christian Zoffoli ) +- added french in spec +- more macros + +* Fri Feb 02 2001 Guillaume Rousse 1.2-6mdk +- corrected launch script + +* Thu Feb 01 2001 Christian Zoffoli 1.2-5mdk +- more macros +- added italian in spec + +* Wed Jan 31 2001 Guillaume Rousse 1.2-4mdk +- merged with Henri Gomez specs: +- changed name to ant +- changed javadir to /usr/share/java +- dropped jdk and jre requirement +- corrected require to jaxp +- added Jikes support +- used our own bash script +- dropped perl script +- dropped ant home directory + +* Sun Jan 14 2001 Guillaume Rousse 1.2-3mdk +- changed name to jakarta-ant +- changed group to Development/Java + +* Wed Jan 04 2001 Guillaume Rousse 1.2-2mdk +- new spec file +- discarded ugly non-free Sun jaxp library from sources, and used pretty open-source xerces instead + +* Wed Dec 20 2000 Guillaume Rousse 1.2-1mdk +- first Mandrake release +- used SRPMS from Henri Gomez