From dafbd0b0db813606346f9e490b3049e6b6d72610 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:46:07 +0000 Subject: [PATCH] import CS ant-1.10.15-18.module_el9+1171+eb38a622 --- .ant.metadata | 2 +- .gitignore | 2 +- SOURCES/ant-build.xml.patch | 55 +- SOURCES/apache-ant-1.8.ant.conf | 4 + SPECS/ant.spec | 1048 ++++++++----------------------- 5 files changed, 277 insertions(+), 834 deletions(-) diff --git a/.ant.metadata b/.ant.metadata index 9095fa2..0e66641 100644 --- a/.ant.metadata +++ b/.ant.metadata @@ -1 +1 @@ -24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2 +1af047a4f58498c2f130a4cd576e39d528c82662 SOURCES/apache-ant-1.10.15-src.tar.bz2 diff --git a/.gitignore b/.gitignore index bd5d660..f1747c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/apache-ant-1.10.7-src.tar.bz2 +SOURCES/apache-ant-1.10.15-src.tar.bz2 diff --git a/SOURCES/ant-build.xml.patch b/SOURCES/ant-build.xml.patch index 948808c..46706ee 100644 --- a/SOURCES/ant-build.xml.patch +++ b/SOURCES/ant-build.xml.patch @@ -1,15 +1,6 @@ ---- apache-ant-1.10.7/build.xml~ 2019-10-31 14:10:07.739864466 +0100 -+++ apache-ant-1.10.7/build.xml 2019-10-31 14:10:12.018897830 +0100 -@@ -145,8 +145,6 @@ - --> - - -- -- - - - diff --git a/SOURCES/apache-ant-1.8.ant.conf b/SOURCES/apache-ant-1.8.ant.conf index e169839..1a27083 100644 --- a/SOURCES/apache-ant-1.8.ant.conf +++ b/SOURCES/apache-ant-1.8.ant.conf @@ -17,4 +17,8 @@ else # ANT_HOME for rpm layout ANT_HOME=/usr/share/ant + + if [ -z "$JAVA_HOME" ] ; then + . /etc/java/ant.conf + fi fi diff --git a/SPECS/ant.spec b/SPECS/ant.spec index 7140cc8..0a01369 100644 --- a/SPECS/ant.spec +++ b/SPECS/ant.spec @@ -28,41 +28,55 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +%bcond_with bootstrap + +%if %{without bootstrap} +%bcond_with ant_minimal +%else +%bcond_without ant_minimal +%endif + %global ant_home %{_datadir}/ant Name: ant -Version: 1.10.7 -Release: 2%{?dist} +Version: 1.10.15 +Release: 18%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java -License: ASL 2.0 +License: Apache-2.0 URL: https://ant.apache.org/ -Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source2: apache-ant-1.8.ant.conf # manpage Source3: ant.asciidoc -Patch0: %{name}-build.xml.patch +Patch: %{name}-build.xml.patch +BuildRequires: rubygem-asciidoctor + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: javapackages-local -BuildRequires: java-devel >= 1:1.8.0 -BuildRequires: ant >= 1.10.2 +BuildRequires: ant BuildRequires: ant-junit +%endif -BuildRequires: asciidoc -BuildRequires: xmlto - +%if %{without ant_minimal} BuildRequires: mvn(antlr:antlr) BuildRequires: mvn(bcel:bcel) BuildRequires: mvn(bsf:bsf) BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(commons-logging:commons-logging-api) BuildRequires: mvn(commons-net:commons-net) -BuildRequires: mvn(javax.mail:mail) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(jakarta.mail:jakarta.mail-api) BuildRequires: mvn(jdepend:jdepend) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:1.2.13) +BuildRequires: mvn(org.apache.commons:commons-logging::api:) BuildRequires: mvn(org.tukaani:xz) BuildRequires: mvn(oro:oro) BuildRequires: mvn(regexp:regexp) @@ -72,21 +86,11 @@ BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.hamcrest:hamcrest-library) BuildRequires: junit5 - -# Theoretically Ant might be usable with just JRE, but typical Ant -# workflow requires full JDK, so we recommend it here. -%if 0%{?fedora} || 0%{?rhel} > 7 -Recommends: java-devel >= 1:1.8.0 -%else -Requires: java-devel >= 1:1.8.0 %endif Requires: %{name}-lib = %{version}-%{release} -# Require full javapackages-tools since the ant script uses -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - -BuildArch: noarch +Requires: %{name}-jdk-binding +Suggests: %{name}-openjdk21 = %{version}-%{release} %description Apache Ant is a Java library and command-line tool whose mission is to @@ -115,6 +119,18 @@ Summary: Core part of %{name} %description lib Core part of Apache Ant that can be used as a library. +%package junit +Summary: Optional junit tasks for %{name} +Requires: %{name} = %{version}-%{release} + +%description junit +Optional junit tasks for %{name}. + +%description junit -l fr +Taches junit optionelles pour %{name}. + +%if %{without ant_minimal} + %package jmf Summary: Optional jmf tasks for %{name} Requires: %{name} = %{version}-%{release} @@ -185,8 +201,6 @@ Optional commons net tasks for %{name}. %description commons-net -l fr Taches commons net optionelles pour %{name}. -# Disable because we don't ship the dependencies - %package apache-bcel Summary: Optional apache bcel tasks for %{name} Requires: %{name} = %{version}-%{release} @@ -197,16 +211,6 @@ Optional apache bcel tasks for %{name}. %description apache-bcel -l fr Taches apache bcel optionelles pour %{name}. -%package apache-log4j -Summary: Optional apache log4j tasks for %{name} -Requires: %{name} = %{version}-%{release} - -%description apache-log4j -Optional apache log4j tasks for %{name}. - -%description apache-log4j -l fr -Taches apache log4j optionelles pour %{name}. - %package apache-oro Summary: Optional apache oro tasks for %{name} Requires: %{name} = %{version}-%{release} @@ -244,15 +248,15 @@ Requires: %{name} = %{version}-%{release} %description imageio Optional imageio tasks for %{name}. -%package javamail -Summary: Optional javamail tasks for %{name} +%package jakartamail +Summary: Optional jakartamail tasks for %{name} Requires: %{name} = %{version}-%{release} -%description javamail -Optional javamail tasks for %{name}. +%description jakartamail +Optional jakartamail tasks for %{name}. -%description javamail -l fr -Taches javamail optionelles pour %{name}. +%description jakartamail -l fr +Taches jakartamail optionelles pour %{name}. %package jdepend Summary: Optional jdepend tasks for %{name} @@ -274,16 +278,6 @@ Optional jsch tasks for %{name}. %description jsch -l fr Taches jsch optionelles pour %{name}. -%package junit -Summary: Optional junit tasks for %{name} -Requires: %{name} = %{version}-%{release} - -%description junit -Optional junit tasks for %{name}. - -%description junit -l fr -Taches junit optionelles pour %{name}. - %package junit5 Summary: Optional junit5 tasks for %{name} Requires: %{name} = %{version}-%{release} @@ -310,6 +304,10 @@ Optional xz tasks for %{name}. %package manual Summary: Manual for %{name} +# ant-manual contains file tutorial-tasks-filesets-properties.zip +# which in turn contains src/Find.java and src/FindTest.java both +# licensed under ASL 1.1. See rhbz#1055629 +License: Apache-2.0 AND Apache-1.1 %description manual Documentation for %{name}. @@ -329,28 +327,73 @@ Javadoc for %{name}. %description javadoc -l fr Javadoc pour %{name}. +%endif + +%package -n ant-openjdk21 +Summary: ant binding for openjdk21 +Provides: ant-jdk-binding +Requires: java-21-openjdk-headless +Recommends: java-21-openjdk-devel +Requires: javapackages-tools +Requires(meta): ant + +%description -n ant-openjdk21 +Configures ant to work with openjdk21. + +%files -n ant-openjdk21 +%ghost /usr/share/jpbinding/ant.conf +%dir /usr/share/jpbinding/ant.conf.d +%{_jpbindingdir}/ant.conf.d/openjdk21 + +%package -n ant-unbound +Summary: ant binding for unbound +Provides: ant-jdk-binding +Requires: javapackages-tools +Requires(meta): ant + +%description -n ant-unbound +Configures ant to work with unbound. + +%files -n ant-unbound +%ghost /usr/share/jpbinding/ant.conf +%dir /usr/share/jpbinding/ant.conf.d +%{_jpbindingdir}/ant.conf.d/unbound + # ----------------------------------------------------------------------------- %prep -%setup -q -n apache-ant-%{version} -%patch0 -p1 +%autosetup -p1 -n apache-ant-%{version} # clean jar files find . -name "*.jar" | xargs -t rm -# Use our own version of javamail -%pom_remove_dep com.sun.mail:jakarta.mail src/etc/poms/ant-javamail -%pom_add_dep com.sun.mail:javax.mail::compile src/etc/poms/ant-javamail - # 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/optional/image/ImageIOTest.java \ src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ src/tests/junit/org/apache/tools/mail/MailMessageTest.java +# Test relies on internal JUnit 5 API that was changed +rm src/tests/junit/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyXmlResultFormatterTest.java + +# Log4jListener is deprecated by upstream: Apache Log4j (1) is not +# developed any more. Last release is 1.2.17 from 26 May 2012 and +# contains vulnerability issues. +rm src/main/org/apache/tools/ant/listener/Log4jListener.java + #install jars -build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j +%if %{with bootstrap} +ln -s %{_prefix}/lib/javapackages-bootstrap/junit.jar lib/optional/junit.jar +ln -s %{_prefix}/lib/javapackages-bootstrap/hamcrest-core.jar lib/optional/hamcrest-core.jar +%else +%if %{with ant_minimal} +build-jar-repository -s -p lib/optional junit hamcrest/core hamcrest/library +%else +build-jar-repository -s -p lib/optional antlr bcel commons-lang3 jakarta-mail/jakarta.mail-api jakarta-activation/jakarta.activation-api jdepend junit oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j +%endif +%endif # fix hardcoded paths in ant script and conf cp -p %{SOURCE2} %{name}.conf @@ -365,44 +408,63 @@ sed -e 's:/etc/ant.conf:%{_sysconfdir}/ant.conf:g' \ sed -i 's/jaxp_parser_impl//;s/xml-commons-apis//' src/script/ant # Fix file-not-utf8 rpmlint warning -iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 +iconv KEYS -f iso-8859-1 -t utf-8 >KEYS.utf8 mv KEYS.utf8 KEYS -iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 +iconv LICENSE -f iso-8859-1 -t utf-8 >LICENSE.utf8 mv LICENSE.utf8 LICENSE # We want a hard dep on antlr %pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml +# fix javamail dependency coordinates (remove once javamail is updated) +%pom_change_dep com.sun.mail:jakarta.mail jakarta.mail:jakarta.mail-api src/etc/poms/ant-jakartamail/pom.xml + +%pom_change_dep commons-logging:commons-logging-api org.apache.commons:commons-logging::api: src/etc/poms/ant-commons-logging/pom.xml + %build +%if %{with ant_minimal} +%{ant} jars +%else %{ant} jars test-jar javadocs +%endif # typeset the manpage -mkdir man -asciidoc -b docbook -d manpage -o man/%{name}.xml %{SOURCE3} -xmlto man man/%{name}.xml -o man +asciidoctor -b manpage -D man %{SOURCE3} -#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 -# ----------------------------------------------------------------------------- +# remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. +rm build/lib/ant-jai.jar build/lib/ant-netrexx.jar +# log4j logging is deprecated +rm build/lib/ant-apache-log4j.jar +# dropped in favor of jakartamail +rm build/lib/ant-javamail.jar %install # ANT_HOME and subdirs -mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin} +mkdir -p %{buildroot}%{ant_home}/{lib,etc,bin} %mvn_alias :ant org.apache.ant:ant-nodeps apache:ant ant:ant %mvn_alias :ant-launcher ant:ant-launcher %mvn_file ':{ant,ant-bootstrap,ant-launcher}' %{name}/@1 @1 -for jar in build/lib/*.jar -do +%if %{with ant_minimal} +mv build/lib build/lib0 +mkdir build/lib/ +mv build/lib0/ant.jar build/lib/ +mv build/lib0/ant-bootstrap.jar build/lib/ +mv build/lib0/ant-launcher.jar build/lib/ +mv build/lib0/ant-junit.jar build/lib/ +mv build/lib0/ant-junit4.jar build/lib/ +%endif + +for jar in build/lib/*.jar; do # Make sure that installed JARs are not empty - jar tf ${jar} | egrep -q *.class + jar tf ${jar} | grep -E -q '.*\.class' jarname=$(basename $jar .jar) # jar aliases - ln -sf ../../java/%{name}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar + ln -sf ../../java/%{name}/${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar pom=src/etc/poms/${jarname}/pom.xml @@ -430,65 +492,82 @@ rm -f src/script/*.bat rm -f src/script/*.cmd # XSLs -cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc +%if %{with ant_minimal} +rm src/etc/jdepend-frames.xsl +rm src/etc/jdepend.xsl +rm src/etc/maudit-frames.xsl +%endif +cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc # install everything else -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -p src/script/ant $RPM_BUILD_ROOT%{_bindir}/ -ln -sf %{_bindir}/ant $RPM_BUILD_ROOT%{ant_home}/bin/ -cp -p src/script/antRun $RPM_BUILD_ROOT%{ant_home}/bin/ +mkdir -p %{buildroot}%{_bindir} +cp -p src/script/ant %{buildroot}%{_bindir}/ +ln -sf %{_bindir}/ant %{buildroot}%{ant_home}/bin/ +cp -p src/script/antRun %{buildroot}%{ant_home}/bin/ # default ant.conf -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf +mkdir -p %{buildroot}%{_sysconfdir} +cp -p %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf # OPT_JAR_LIST fragments -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d -echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf -echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing -echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr -echo "rhino 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 "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging -echo "apache-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 "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j -echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro -echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp -echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2 -echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio -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 "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch -echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit -echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4 -echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher -echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil -echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz +mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d +echo "junit hamcrest/core ant/ant-junit" > %{buildroot}%{_sysconfdir}/%{name}.d/junit +echo "junit hamcrest/core ant/ant-junit4" > %{buildroot}%{_sysconfdir}/%{name}.d/junit4 + +# JDK bindings +%if !0%{?specpartsdir:1} +export RPM_SPECPARTS_DIR=/tmp +%endif +install -d -m 755 %{buildroot}%{_javaconfdir}/ +ln -sf %{_jpbindingdir}/ant.conf %{buildroot}%{_javaconfdir}/ant.conf +echo 'JAVA_HOME=%{_jvmdir}/jre-21-openjdk' > %{buildroot}%{_javaconfdir}/ant-openjdk21.conf +%jp_binding --verbose --variant openjdk21 --ghost ant.conf --target %{_javaconfdir}/ant-openjdk21.conf --provides %{name}-jdk-binding --requires java-21-openjdk-headless --recommends java-21-openjdk-devel +touch %{buildroot}%{_javaconfdir}/ant-unbound.conf +%jp_binding --verbose --variant unbound --ghost ant.conf --target %{_javaconfdir}/ant-unbound.conf --provides %{name}-jdk-binding + +%if %{without ant_minimal} + +echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf +echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing +echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/%{name}.d/antlr +echo "bsf commons-logging ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-bsf +echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-resolver +echo "apache-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/%{name}.d/commons-logging +echo "apache-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/%{name}.d/commons-net +echo "bcel commons-lang3 ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-bcel +echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-oro +echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-regexp +echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/%{name}.d/apache-xalan2 +echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/%{name}.d/imageio +echo "jakartamail jaf ant/ant-jakartamail" > %{buildroot}%{_sysconfdir}/%{name}.d/jakartamail +echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/%{name}.d/jdepend +echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/%{name}.d/jsch +echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/%{name}.d/junitlauncher +echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/%{name}.d/testutil +echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/%{name}.d/xz # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} # fix link between manual and javadoc (cd manual; ln -sf %{_javadocdir}/%{name} api) +%endif + # manpage install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +%if %{without ant_minimal} %check -%if 0%{?rhel} && 0%{?rhel} <= 7 -export LC_ALL=en_US.UTF-8 -%else -export LC_ALL=C.UTF-8 +%{ant} -Doffline=true test %endif -%{ant} test %files %doc KEYS README WHATSNEW %license LICENSE NOTICE +%config %{_javaconfdir}/%{name}*.conf %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %dir %{ant_home}/bin @@ -513,6 +592,19 @@ export LC_ALL=C.UTF-8 %{ant_home}/lib/%{name}-launcher.jar %{ant_home}/lib/%{name}-bootstrap.jar +%files junit -f .mfiles-junit +%{ant_home}/lib/%{name}-junit.jar +%{ant_home}/lib/%{name}-junit4.jar +%config(noreplace) %{_sysconfdir}/%{name}.d/junit +%config(noreplace) %{_sysconfdir}/%{name}.d/junit4 +%{ant_home}/etc/junit-frames.xsl +%{ant_home}/etc/junit-noframes.xsl +%{ant_home}/etc/junit-frames-xalan1.xsl +%{ant_home}/etc/junit-frames-saxon.xsl +%{ant_home}/etc/junit-noframes-saxon.xsl + +%if %{without ant_minimal} + %files jmf -f .mfiles-jmf %{ant_home}/lib/%{name}-jmf.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jmf @@ -541,16 +633,10 @@ export LC_ALL=C.UTF-8 %{ant_home}/lib/%{name}-commons-net.jar %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net -# Disable as we dont ship the dependencies - %files apache-bcel -f .mfiles-apache-bcel %{ant_home}/lib/%{name}-apache-bcel.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel -%files apache-log4j -f .mfiles-apache-log4j -%{ant_home}/lib/%{name}-apache-log4j.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j - %files apache-oro -f .mfiles-apache-oro %{ant_home}/lib/%{name}-apache-oro.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro @@ -568,9 +654,9 @@ export LC_ALL=C.UTF-8 %{ant_home}/lib/%{name}-imageio.jar %config(noreplace) %{_sysconfdir}/%{name}.d/imageio -%files javamail -f .mfiles-javamail -%{ant_home}/lib/%{name}-javamail.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/javamail +%files jakartamail -f .mfiles-jakartamail +%{ant_home}/lib/%{name}-jakartamail.jar +%config(noreplace) %{_sysconfdir}/%{name}.d/jakartamail %files jdepend -f .mfiles-jdepend %{ant_home}/lib/%{name}-jdepend.jar @@ -582,17 +668,6 @@ export LC_ALL=C.UTF-8 %{ant_home}/lib/%{name}-jsch.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jsch -%files junit -f .mfiles-junit -%{ant_home}/lib/%{name}-junit.jar -%{ant_home}/lib/%{name}-junit4.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/junit -%config(noreplace) %{_sysconfdir}/%{name}.d/junit4 -%{ant_home}/etc/junit-frames.xsl -%{ant_home}/etc/junit-noframes.xsl -%{ant_home}/etc/junit-frames-xalan1.xsl -%{ant_home}/etc/junit-frames-saxon.xsl -%{ant_home}/etc/junit-noframes-saxon.xsl - %files junit5 -f .mfiles-junitlauncher %{ant_home}/lib/%{name}-junitlauncher.jar %config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher @@ -613,695 +688,68 @@ export LC_ALL=C.UTF-8 %license LICENSE NOTICE %{_javadocdir}/%{name} +%endif + # ----------------------------------------------------------------------------- %changelog -* Tue Nov 05 2019 Mikolaj Izdebski - 1.10.7-2 -- Mass rebuild for javapackages-tools 201902 +* Fri Jan 10 2025 Marian Koncek - 1.10.15-19 +- Import from Fedora -* Wed Oct 16 2019 Marian Koncek - 1.10.7-1 -- Update to upstream version 1.10.7 +* Thu Jan 02 2025 Mikolaj Izdebski - 1.10.15-18 +- Drop Obsoletes on ant-javamail -* Fri May 24 2019 Mikolaj Izdebski - 1.10.6-2 -- Mass rebuild for javapackages-tools 201901 +* Wed Dec 04 2024 Mikolaj Izdebski - 1.10.15-17 +- Exclude several subpackages from unbound test plan -* Wed May 08 2019 Mikolaj Izdebski - 1.10.6-1 -- Update to upstream version 1.10.6 +* Tue Dec 03 2024 Mikolaj Izdebski - 1.10.15-16 +- Fix ant-manual license field -* Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek - 0:1.10.5-3 -- Use C.UTF-8 locale - See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot +* Mon Dec 02 2024 Mikolaj Izdebski - 1.10.15-15 +- Use smaller jlink image -* Mon Aug 20 2018 Mat Booth - 0:1.10.5-2 -- Enable building the optional junit5 module +* Mon Dec 02 2024 Mikolaj Izdebski - 1.10.15-14 +- Require /plans/matrix/unbound/jlink for gating -* Thu Aug 02 2018 Michael Simacek - 0:1.10.5-1 -- Update to upstream version 1.10.5 +* Mon Dec 02 2024 Mikolaj Izdebski - 1.10.15-13 +- Add test plan for ant-unbound -* Thu Aug 02 2018 Michael Simacek - 0:1.10.4-4 -- Add a manpage -- Avoid installing antRun auxiliary script in bindir, keep it in ant_home +* Mon Dec 02 2024 Mikolaj Izdebski - 1.10.15-12 +- Exclude ant-unbound from openjdk21 tests -* Mon Jul 30 2018 Severin Gehwolf - 0:1.10.4-3 -- Require javapackages-tools for ant script. +* Fri Nov 29 2024 Mikolaj Izdebski - 1.10.15-11 +- Drop explicit requires on javapackages-tools -* Thu Jul 12 2018 Fedora Release Engineering - 0:1.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Fri Nov 22 2024 Mikolaj Izdebski - 1.10.15-10 +- Generate bindings with %%jp_binding macro -* Tue Jun 26 2018 Michael Simacek - 0:1.10.4-1 -- Update to upstream version 1.10.4 -- Resolves: rhbz#1584407 +* Wed Oct 30 2024 Mikolaj Izdebski - 1.10.15-9 +- Work around iconv clobbering file permissions -* Wed Apr 18 2018 Mikolaj Izdebski - 0:1.10.3-2 -- Remove legacy Obsoletes/Provides +* Wed Oct 30 2024 Marian Koncek - 1.10.15-8 +- Replace with %%{buildroot} -* Wed Mar 28 2018 Michael Simacek - 0:1.10.3-1 -- Update to upstream version 1.10.3 +* Wed Oct 30 2024 Marian Koncek - 1.10.15-7 +- Add ant-openjdk21 subpackage -* Wed Feb 7 2018 Mikolaj Izdebski - 0:1.10.2-1 -- Update to upstream version 1.10.2 +* Wed Oct 30 2024 Mikolaj Izdebski - 1.10.15-6 +- Respect JAVA_HOME set by user -* Wed Feb 07 2018 Fedora Release Engineering - 0:1.10.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Wed Oct 30 2024 Mikolaj Izdebski - 1.10.15-5 +- Switch to matrix tests -* Mon Sep 04 2017 Michael Simacek - 0:1.10.1-8 -- Fix directory ownership +* Thu Sep 19 2024 Mikolaj Izdebski - 1.10.15-4 +- Require OpenJDK 21 for runtime -* Wed Jul 26 2017 Fedora Release Engineering - 0:1.10.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Wed Sep 18 2024 Marian Koncek - 1.10.15-3 +- Use asciidoctor instead of asciidoc for manpage generation -* Tue Mar 28 2017 Michael Simacek - 0:1.10.1-6 -- Fix requires -- Use JDK's jaxp instead of xerces +* Tue Sep 03 2024 Mikolaj Izdebski - 1.10.15-2 +- Use %%autosetup -C -* Tue Mar 21 2017 Michael Simacek - 0:1.10.1-5 -- Install with XMvn +* Tue Sep 03 2024 Mikolaj Izdebski - 1.10.15-1 +- Update to upstream version 1.10.15 +- Resolves: rhbz#2309001 -* Wed Mar 1 2017 Mikolaj Izdebski - 0:1.10.1-4 -- Fix hardcoded paths in ant script and conf -- Fix requires on xz-java - -* Thu Feb 23 2017 Mikolaj Izdebski - 0:1.10.1-3 -- Don't hardcode path to xargs - -* Thu Feb 16 2017 Mikolaj Izdebski - 0:1.10.1-2 -- Conditionalize weak dependencies - -* Wed Feb 15 2017 Michael Simacek - 0:1.10.1-1 -- Update to upstream version 1.10.1 - -* Fri Feb 10 2017 Michael Simacek - 0:1.10.0-3 -- Use log4j12 - -* Fri Feb 10 2017 Fedora Release Engineering - 0:1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 02 2017 Michael Simacek - 0:1.10.0-1 -- Update to upstream version 1.10.0 - -* Mon Dec 12 2016 Mikolaj Izdebski - 0:1.9.7-1 -- Update to upstream version 1.9.7 - -* Wed Feb 03 2016 Fedora Release Engineering - 0:1.9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jul 10 2015 Mikolaj Izdebski - 0:1.9.6-2 -- Recommend java-devel instead of requiring it - -* Thu Jul 02 2015 Michael Simacek - 0:1.9.6-1 -- Update to upstream version 1.9.6 - -* Tue Jun 16 2015 Fedora Release Engineering - 0:1.9.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 04 2015 Michael Simacek - 0:1.9.5-1 -- Update to upstream version 1.9.5 - -* Fri Apr 03 2015 Michael Simacek - 0:1.9.4-11 -- Move launcher to lib subpackage - -* Wed Apr 1 2015 Mikolaj Izdebski - 0:1.9.4-10 -- Update description - -* Tue Mar 31 2015 Michael Simacek - 0:1.9.4-9 -- Split library part into subpackage (rhbz#1119283) - -* Wed Mar 11 2015 Mikolaj Izdebski - 0:1.9.4-8 -- Add alias for ant:ant-launcher - -* Wed Feb 4 2015 Mikolaj Izdebski - 0:1.9.4-7 -- Add hamcrest to ant-junit classpath - -* Mon Jan 26 2015 Michael Simacek - 0:1.9.4-6 -- Add hamcrest into classpath - -* Tue Jan 13 2015 Mat Booth - 0:1.9.4-5 -- Resolves: rhbz#1180568 - Add rhino to classpath for bsf plug-in - -* Mon Aug 11 2014 Mikolaj Izdebski - 0:1.9.4-4 -- Add aliases for ant:ant and apache:ant - -* Sat Jun 07 2014 Fedora Release Engineering - 0:1.9.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 6 2014 Alexander Kurtakov 0:1.9.4-2 -- Reenable tests. - -* Tue May 6 2014 Alexander Kurtakov 0:1.9.4-1 -- Update to upstream 1.9.4. -- Disable tests as they use new junit tas attribute added in this release. - -* Fri Feb 21 2014 Mikolaj Izdebski - 0:1.9.3-2 -- Skip installation perl and python scripts - -* Thu Jan 2 2014 Mikolaj Izdebski - 0:1.9.3-1 -- Update to upstream version 1.9.3 - -* 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 - -* 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) - -* Tue 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. - -* Tue 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 - -* Thu 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 +* Mon Aug 26 2024 Mikolaj Izdebski - 1.10.14-22 +- Drop explicit LC_ALL setting