From 7e7f40fa0187ec607cf3f9d5550ee9df7dd5df4f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 20:27:31 +0100 Subject: [PATCH] fixed installation paths [release 1.9.13-2mamba;Fri Aug 10 2018] --- ant-1.8.4.pom | 222 --- ant-antlr-1.8.4.pom | 76 - ant-apache-bcel-1.8.4.pom | 72 - ant-apache-bsf-1.8.4.pom | 75 - ant-apache-log4j-1.8.4.pom | 70 - ant-apache-oro-1.8.4.pom | 75 - ant-apache-regexp-1.8.4.pom | 71 - ant-apache-resolver-1.8.4.pom | 70 - ant-commons-logging-1.8.4.pom | 71 - ant-commons-net-1.8.4.pom | 76 - ant-jai-1.8.4.pom | 85 -- ant-javamail-1.8.4.pom | 79 - ant-jdepend-1.8.4.pom | 73 - ant-jmf-1.8.4.pom | 66 - ant-jsch-1.8.4.pom | 75 - ant-junit-1.8.4.pom | 101 -- ant-launcher-1.8.4.pom | 58 - ant-parent-1.8.4.pom | 120 -- ant-swing-1.8.4.pom | 67 - ant-testutil-1.8.4.pom | 75 - apache-ant-1.7.1-gnu-classpath.patch | 35 - apache-ant-1.7.1-no-test-jar.patch | 11 - apache-ant-1.8.3-class_path_in_manifest.patch | 13 - apache-ant-1.9.13-ant-1.8.patch | 12 + apache-ant-ant.conf | 4 + apache-ant-bin_ant | 6 + apache-ant.spec | 1289 ++--------------- 27 files changed, 152 insertions(+), 2895 deletions(-) delete mode 100644 ant-1.8.4.pom delete mode 100644 ant-antlr-1.8.4.pom delete mode 100644 ant-apache-bcel-1.8.4.pom delete mode 100644 ant-apache-bsf-1.8.4.pom delete mode 100644 ant-apache-log4j-1.8.4.pom delete mode 100644 ant-apache-oro-1.8.4.pom delete mode 100644 ant-apache-regexp-1.8.4.pom delete mode 100644 ant-apache-resolver-1.8.4.pom delete mode 100644 ant-commons-logging-1.8.4.pom delete mode 100644 ant-commons-net-1.8.4.pom delete mode 100644 ant-jai-1.8.4.pom delete mode 100644 ant-javamail-1.8.4.pom delete mode 100644 ant-jdepend-1.8.4.pom delete mode 100644 ant-jmf-1.8.4.pom delete mode 100644 ant-jsch-1.8.4.pom delete mode 100644 ant-junit-1.8.4.pom delete mode 100644 ant-launcher-1.8.4.pom delete mode 100644 ant-parent-1.8.4.pom delete mode 100644 ant-swing-1.8.4.pom delete mode 100644 ant-testutil-1.8.4.pom delete mode 100644 apache-ant-1.7.1-gnu-classpath.patch delete mode 100644 apache-ant-1.7.1-no-test-jar.patch delete mode 100644 apache-ant-1.8.3-class_path_in_manifest.patch create mode 100644 apache-ant-1.9.13-ant-1.8.patch create mode 100644 apache-ant-ant.conf create mode 100644 apache-ant-bin_ant diff --git a/ant-1.8.4.pom b/ant-1.8.4.pom deleted file mode 100644 index cde5ea6..0000000 --- a/ant-1.8.4.pom +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant - 1.8.4 - Apache Ant Core - - - org.apache.ant - ant-launcher - 1.8.4 - compile - - - - - ../../../../target/ant/.build.timestamp.properties - - - - org.apache.maven.plugins - maven-jar-plugin - - - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - delete-timestamp-file - clean - - run - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/listener/Log4jListener* - org/apache/tools/ant/listener/CommonsLoggingListener* - org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/taskdefs/email/MimeMailer* - org/apache/tools/ant/launch/** - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/net/TelnetTask* - org/apache/tools/ant/taskdefs/optional/perforce/* - org/apache/tools/ant/taskdefs/optional/junit/* - org/apache/tools/ant/taskdefs/optional/ssh/* - org/apache/tools/ant/taskdefs/optional/image/* - org/apache/tools/ant/types/optional/image/* - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/util/ScriptRunner.java - org/apache/tools/ant/util/optional/ScriptRunner.java - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/util/depend/bcel/* - org/apache/tools/ant/taskdefs/optional/NetRexxC* - org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport* - org/apache/tools/ant/taskdefs/optional/jdepend/* - - - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/Script* - org/apache/tools/ant/listener/Log4jListener* - org/apache/tools/ant/listener/CommonsLoggingListener* - org/apache/tools/ant/util/regexp/JakartaRegexp* - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/util/regexp/Jdk14Regexp* - org/apache/tools/ant/taskdefs/email/MimeMailer* - org/apache/tools/ant/launch/** - org/apache/tools/ant/taskdefs/StyleTest* - org/apache/tools/ant/taskdefs/optional/junit/ - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/ssh/* - org/apache/tools/ant/taskdefs/optional/perforce/* - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - ant.home - ${env.ANT_HOME} - - - build.tests - ../../../../target/ant/testcases - - - build.tests.value - ../../../../target/ant/testcases - - - offline - true - - - root - ../../../.. - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - - - - ../../../../src/main - true - - org/apache/tools/ant/taskdefs/default.properties - org/apache/tools/ant/types/default.properties - org/apache/tools/ant/taskdefs/default.properties - org/apache/tools/ant/types/conditions/antlib.xml - org/apache/tools/ant/defaultManifest.mf - org/apache/tools/ant/version.txt - - - - ../../../../src/resources - true - - **/antlib.xml - - - - ../../../../docs - false - - images/ant_logo_large.gif - - - - - - ../../../../src/etc/testcases - true - - - ../../../../src/main - true - - **/*.java - - - - ../../../../src/main - ../../../../src/tests/junit - ../../../../target/ant/classes - ../../../../target/ant/testcases - ../../../../target/ant - - diff --git a/ant-antlr-1.8.4.pom b/ant-antlr-1.8.4.pom deleted file mode 100644 index ddd4762..0000000 --- a/ant-antlr-1.8.4.pom +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-antlr - 1.8.4 - Apache Ant + ANTLR - antlr specific task. - The implementation forks a java process, therefore the antlr jar file is only needed at runtime - - - org.apache.ant - ant - 1.8.4 - true - compile - - - - antlr - antlr - 2.7.2 - true - runtime - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/ANTLR* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-bcel-1.8.4.pom b/ant-apache-bcel-1.8.4.pom deleted file mode 100644 index 8f918c2..0000000 --- a/ant-apache-bcel-1.8.4.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-bcel - 1.8.4 - Apache Ant + BCEL - - - org.apache.ant - ant - 1.8.4 - compile - - - bcel - bcel - 5.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/util/depend/bcel/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-bsf-1.8.4.pom b/ant-apache-bsf-1.8.4.pom deleted file mode 100644 index 8bc8bdd..0000000 --- a/ant-apache-bsf-1.8.4.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-bsf - 1.8.4 - Apache Ant + BSF - - - org.apache.ant - ant - 1.8.4 - compile - - - bsf - bsf - 2.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/util/Script* - org/apache/tools/ant/util/optional/Script* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-log4j-1.8.4.pom b/ant-apache-log4j-1.8.4.pom deleted file mode 100644 index b219c21..0000000 --- a/ant-apache-log4j-1.8.4.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-log4j - 1.8.4 - Apache Ant + Log4J - - - org.apache.ant - ant - 1.8.4 - compile - - - log4j - log4j - 1.2.13 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/listener/Log4jListener* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-oro-1.8.4.pom b/ant-apache-oro-1.8.4.pom deleted file mode 100644 index bcf871e..0000000 --- a/ant-apache-oro-1.8.4.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-oro - 1.8.4 - Apache Ant + Apache Oro - - - org.apache.ant - ant - 1.8.4 - compile - - - oro - oro - 2.0.8 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/util/regexp/JakartaOro* - org/apache/tools/ant/taskdefs/optional/perforce/* - - - org/apache/tools/ant/taskdefs/optional/perforce/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-regexp-1.8.4.pom b/ant-apache-regexp-1.8.4.pom deleted file mode 100644 index 5dd52d0..0000000 --- a/ant-apache-regexp-1.8.4.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-regexp - 1.8.4 - Apache Ant + Apache Regexp - - - org.apache.ant - ant - 1.8.4 - compile - - - regexp - regexp - 1.3 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/util/regexp/JakartaRegexp* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-apache-resolver-1.8.4.pom b/ant-apache-resolver-1.8.4.pom deleted file mode 100644 index f80be28..0000000 --- a/ant-apache-resolver-1.8.4.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-apache-resolver - 1.8.4 - Apache Ant + Apache Resolver - - - org.apache.ant - ant - 1.8.4 - compile - - - xml-resolver - xml-resolver - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/types/resolver/** - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-commons-logging-1.8.4.pom b/ant-commons-logging-1.8.4.pom deleted file mode 100644 index 1039927..0000000 --- a/ant-commons-logging-1.8.4.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-commons-logging - 1.8.4 - Apache Ant + Commons Logging - Ant Listener based on commons-logging - - - org.apache.ant - ant - 1.8.4 - compile - - - commons-logging - commons-logging-api - 1.0.4 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/tlistener/CommonsLoggingListener* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-commons-net-1.8.4.pom b/ant-commons-net-1.8.4.pom deleted file mode 100644 index 3657a7d..0000000 --- a/ant-commons-net-1.8.4.pom +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-commons-net - 1.8.4 - Apache Ant + Commons Net - ftp, rexec and telnet tasks - - - org.apache.ant - ant - 1.8.4 - compile - - - commons-net - commons-net - 1.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/net/TelnetTask* - - - org/apache/tools/ant/taskdefs/optional/net/FTP* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jai-1.8.4.pom b/ant-jai-1.8.4.pom deleted file mode 100644 index a278933..0000000 --- a/ant-jai-1.8.4.pom +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-jai - 1.8.4 - Apache Ant + JAI - image task and corresponding types. - - - - org.apache.ant - ant - 1.8.4 - compile - - - javax.media - jai-core - 1.1.3 - - - com.sun.media - jai-codec - 1.1.3 - - - - - jboss - JBoss - http://repository.jboss.org/maven2/ - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/image/* - org/apache/tools/ant/types/optional/image/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-javamail-1.8.4.pom b/ant-javamail-1.8.4.pom deleted file mode 100644 index 8619020..0000000 --- a/ant-javamail-1.8.4.pom +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-javamail - 1.8.4 - Apache Ant + JavaMail - implementation of the mail task based on javamail. - Required to send emails to SMTP servers using user/password combinations - or to send mail over SSL - - - org.apache.ant - ant - 1.8.4 - compile - - - javax.mail - mail - 1.4 - compile - - - javax.activation - activation - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/email/MimeMailer* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jdepend-1.8.4.pom b/ant-jdepend-1.8.4.pom deleted file mode 100644 index 559b7e9..0000000 --- a/ant-jdepend-1.8.4.pom +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-jdepend - 1.8.4 - Apache Ant + JDepend - task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the - jdepend parser available on the maven repository - - - org.apache.ant - ant - 1.8.4 - compile - - - jdepend - jdepend - 2.7 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/jdepend/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jmf-1.8.4.pom b/ant-jmf-1.8.4.pom deleted file mode 100644 index e6763c5..0000000 --- a/ant-jmf-1.8.4.pom +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-jmf - 1.8.4 - Apache Ant + JMF - contains the sound task and a soundplayer listener - download the dependency from http://java.sun.com/products/java-media/jmf/ - - - org.apache.ant - ant - 1.8.4 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/sound/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-jsch-1.8.4.pom b/ant-jsch-1.8.4.pom deleted file mode 100644 index ea9ee1f..0000000 --- a/ant-jsch-1.8.4.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-jsch - 1.8.4 - Apache Ant + JSch - contains the sshexec and scp tasks - jsch 0.1.29 might not be available from maven - - - org.apache.ant - ant - 1.8.4 - compile - - - com.jcraft - jsch - 0.1.42 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/ssh/* - - - org/apache/tools/ant/taskdefs/optional/ssh/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-junit-1.8.4.pom b/ant-junit-1.8.4.pom deleted file mode 100644 index d8594ef..0000000 --- a/ant-junit-1.8.4.pom +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-junit - 1.8.4 - Apache Ant + JUnit - contains the junit and junirreport tasks - - - org.apache.ant - ant - 1.8.4 - compile - - - junit - junit - 3.8.2 - compile - - - - - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/junit/* - - - org/apache/tools/ant/taskdefs/optional/junit/JUnit4TestMethodAdapter* - - - org/apache/tools/ant/taskdefs/optional/junit/ - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-launcher-1.8.4.pom b/ant-launcher-1.8.4.pom deleted file mode 100644 index cdd1bdd..0000000 --- a/ant-launcher-1.8.4.pom +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-launcher - 1.8.4 - Apache Ant Launcher - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/launch/*.java - - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/ant-launcher/classes - ../../../../target/ant-launcher/testcases - ../../../../target/ant-launcher - - diff --git a/ant-parent-1.8.4.pom b/ant-parent-1.8.4.pom deleted file mode 100644 index 19bf3b9..0000000 --- a/ant-parent-1.8.4.pom +++ /dev/null @@ -1,120 +0,0 @@ - - - - - 4.0.0 - org.apache.ant - ant-parent - 1.8.4 - pom - master POM - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - Apache Ant - http://ant.apache.org/ - 2000 - - The Apache Software Foundation - http://www.apache.org/ - - - - - dummy - Dummy to avoid accidental deploys - - - - - scm:svn:http://svn.apache.org/repos/asf/ant/core/trunk - scm:svn:https://svn.apache.org/repos/asf/ant/core/trunk - http://svn.apache.org/repos/asf/ant/core/trunk - - - hudson - https://builds.apache.org/job/Ant_BuildFromPOMs/ - - - - Ant Developers List - dev-subscribe@ant.apache.org - dev-unsubscribe@ant.apache.org - dev@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-dev - - - Ant Users List - user-subscribe@ant.apache.org - user-unsubscribe@ant.apache.org - user@ant.apache.org - http://mail-archives.apache.org/mod_mbox/ant-user - - - - bugzilla - http://issues.apache.org/bugzilla/ - - - ant - ant-antlr - ant-apache-bcel - ant-apache-bsf - ant-apache-log4j - ant-apache-oro - ant-apache-regexp - ant-apache-resolver - ant-apache-xalan2 - ant-commons-logging - ant-commons-net - ant-jai - ant-javamail - ant-jdepend - ant-jmf - ant-jsch - ant-junit - ant-junit4 - ant-launcher - ant-netrexx - ant-swing - ant-testutil - - - - junit - junit - 3.8.2 - test - - - - ../../../src/main - ../../../src/testcases - ../../../target/classes - ../../../target/testcases - - diff --git a/ant-swing-1.8.4.pom b/ant-swing-1.8.4.pom deleted file mode 100644 index 0fb6405..0000000 --- a/ant-swing-1.8.4.pom +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-swing - 1.8.4 - Apache Ant + Swing - a listener and a splash task based on Swing - - - org.apache.ant - ant - 1.8.4 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/taskdefs/optional/splash/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-testutil-1.8.4.pom b/ant-testutil-1.8.4.pom deleted file mode 100644 index e5cfcfc..0000000 --- a/ant-testutil-1.8.4.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.8.4 - - 4.0.0 - org.apache.ant - ant-testutil - 1.8.4 - Apache Ant Test Utilities - test utility classes - - - org.apache.ant - ant - 1.8.4 - compile - - - junit - junit - 3.8.2 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - org/apache/tools/ant/BuildFileTest* - org/apache/tools/ant/util/regexp/RegexpMatcherTest* - org/apache/tools/ant/util/regexp/RegexpTest* - org/apache/tools/ant/taskdefs/optional/AbstractXSLTLiaisonTest* - org/apache/tools/ant/types/AbstractFileSetTest* - - - - - ../../../../src/tests/junit - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId} - - - diff --git a/apache-ant-1.7.1-gnu-classpath.patch b/apache-ant-1.7.1-gnu-classpath.patch deleted file mode 100644 index 7a280fd..0000000 --- a/apache-ant-1.7.1-gnu-classpath.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig 2008-06-27 01:05:20.000000000 -0400 -+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/util/JavaEnvUtils.java 2008-07-10 17:08:05.793449901 -0400 -@@ -134,7 +134,7 @@ - } - kaffeDetected = false; - try { -- Class.forName("kaffe.util.NotImplemented"); -+ Class.forName("gnu.classpath.Configuration"); - kaffeDetected = true; - } catch (Throwable t) { - // swallow as this simply doesn't seem to be Kaffe ---- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig 2008-06-27 01:05:20.000000000 -0400 -+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java 2008-07-10 17:08:05.801530455 -0400 -@@ -56,7 +56,7 @@ - - private Commandline setupKaffehCommand(Javah javah) { - Commandline cmd = new Commandline(); -- cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh")); -+ cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah")); - - if (javah.getDestdir() != null) { - cmd.createArgument().setValue("-d"); ---- apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java.orig 2008-06-27 01:05:21.000000000 -0400 -+++ apache-ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.java 2008-07-10 17:10:47.081449425 -0400 -@@ -32,9 +32,7 @@ - - // sorted by newest Kaffe version first - private static final String[] N2A_CLASSNAMES = new String[] { -- "gnu.classpath.tools.native2ascii.Native2Ascii", -- // pre Kaffe 1.1.5 -- "kaffe.tools.native2ascii.Native2Ascii", -+ "gnu.classpath.tools.native2ascii.Native2ASCII", - }; - - /** diff --git a/apache-ant-1.7.1-no-test-jar.patch b/apache-ant-1.7.1-no-test-jar.patch deleted file mode 100644 index ca05bd7..0000000 --- a/apache-ant-1.7.1-no-test-jar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-ant-1.7.1/build.xml.orig 2008-07-15 15:34:52.748697343 -0400 -+++ apache-ant-1.7.1/build.xml 2008-07-15 15:35:20.247215410 -0400 -@@ -925,7 +925,7 @@ - =================================================================== - --> - - - diff --git a/apache-ant-1.8.3-class_path_in_manifest.patch b/apache-ant-1.8.3-class_path_in_manifest.patch deleted file mode 100644 index 7fa97e9..0000000 --- a/apache-ant-1.8.3-class_path_in_manifest.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/apache-ant-1.9.13-ant-1.8.patch b/apache-ant-1.9.13-ant-1.8.patch new file mode 100644 index 0000000..dca87eb --- /dev/null +++ b/apache-ant-1.9.13-ant-1.8.patch @@ -0,0 +1,12 @@ +--- apache-ant-1.9.13/build.xml.orig 2018-08-08 20:38:20.867984610 +0200 ++++ apache-ant-1.9.13/build.xml 2018-08-08 20:38:33.980051615 +0200 +@@ -378,9 +378,6 @@ + + + +- +- +- + + diff --git a/apache-ant-ant.conf b/apache-ant-ant.conf new file mode 100644 index 0000000..10db6db --- /dev/null +++ b/apache-ant-ant.conf @@ -0,0 +1,4 @@ +# Apache Ant start script configuration file + +# Optional jars and their dependencies +OPT_JAR_LIST=/usr/share/java/junit.jar diff --git a/apache-ant-bin_ant b/apache-ant-bin_ant new file mode 100644 index 0000000..e245dbe --- /dev/null +++ b/apache-ant-bin_ant @@ -0,0 +1,6 @@ +#!/bin/sh + +. /etc/apache-ant/ant.conf + +export LOCALCLASSPATH=${OPT_JAR_LIST} +/usr/share/apache-ant/bin/ant "$@" diff --git a/apache-ant.spec b/apache-ant.spec index 4f34fad..4a05759 100644 --- a/apache-ant.spec +++ b/apache-ant.spec @@ -1,28 +1,5 @@ -%define bootstrap 1 -%if "%{stage1}" != "1" -%if "%{stage2}" != "1" -%define sun_jai 1 -%define test_jar 1 -%define with_gcj_support 1 -%else -%define sun_jai 0 -%define test_jar 0 -%define with_gcj_support 1 -%endif -%else -%define sun_jai 0 -%define test_jar 0 -%define with_gcj_support 0 -%endif -%define kaffe 0 - -%define anthome %{_datadir}/ant -%define antlib %{anthome}/lib -%define antetc %{anthome}/etc -%define antbin %{anthome}/bin -# http://svn.apache.org/repos/asf/ant/core/trunk/ Name: apache-ant -Version: 1.8.4 +Version: 1.9.13 Release: 2mamba Summary: A Java-based build tool Group: Applications/Development @@ -30,105 +7,18 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://ant.apache.org -Source0: http://mirror.nohup.it/apache/ant/source/%{name}-%{version}-src.tar.bz2 +Source0: http://mirror.nohup.it/apache/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: ant-profile.sh -Source2: http://repo1.maven.org/maven2/org/apache/ant/ant/%{version}/ant-%{version}.pom -Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/%{version}/ant-launcher-%{version}.pom -# see http://www-306.ibm.com/software/awdtools/netrexx/ -#Source4: http://repo1.maven.org/maven2/org/apache/ant/ant-netrexx/%{version}/ant-netrexx-%{version}.pom -# see http://www.borland.com/us/products/starteam/index.html -#Source5: http://repo1.maven.org/maven2/org/apache/ant/ant-starteam/%{version}/ant-starteam-%{version}.pom -##Source6: http://repo1.maven.org/maven2/org/apache/ant/ant-stylebook/%{version}/ant-stylebook-%{version}.pom -# http://e-docs.bea.com/wls/docs92/index.html -#Source7: http://repo1.maven.org/maven2/org/apache/ant/ant-weblogic/%{version}/ant-weblogic-%{version}.pom -Source8: http://repo1.maven.org/maven2/org/apache/ant/ant-antlr/%{version}/ant-antlr-%{version}.pom -Source9: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bsf/%{version}/ant-apache-bsf-%{version}.pom -Source10: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-resolver/%{version}/ant-apache-resolver-%{version}.pom -Source11: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/%{version}/ant-commons-logging-%{version}.pom -Source12: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/%{version}/ant-commons-net-%{version}.pom -Source13: http://repo1.maven.org/maven2/org/apache/ant/ant-jai/%{version}/ant-jai-%{version}.pom -Source14: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/%{version}/ant-apache-bcel-%{version}.pom -Source15: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/%{version}/ant-apache-log4j-%{version}.pom -Source16: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-oro/%{version}/ant-apache-oro-%{version}.pom -Source17: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-regexp/%{version}/ant-apache-regexp-%{version}.pom -Source18: http://repo1.maven.org/maven2/org/apache/ant/ant-javamail/%{version}/ant-javamail-%{version}.pom -Source19: http://repo1.maven.org/maven2/org/apache/ant/ant-jdepend/%{version}/ant-jdepend-%{version}.pom -Source20: http://repo1.maven.org/maven2/org/apache/ant/ant-jmf/%{version}/ant-jmf-%{version}.pom -Source21: http://repo1.maven.org/maven2/org/apache/ant/ant-jsch/%{version}/ant-jsch-%{version}.pom -Source22: http://repo1.maven.org/maven2/org/apache/ant/ant-junit/%{version}/ant-junit-%{version}.pom -##Source23: http://repo1.maven.org/maven2/org/apache/ant/ant-nodeps/%{version}/ant-nodeps-%{version}.pom -Source24: http://repo1.maven.org/maven2/org/apache/ant/ant-swing/%{version}/ant-swing-%{version}.pom -##Source25: http://repo1.maven.org/maven2/org/apache/ant/ant-trax/%{version}/ant-trax-%{version}.pom -Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/%{version}/ant-parent-%{version}.pom -Source27: http://repo1.maven.org/maven2/org/apache/ant/ant-testutil/%{version}/ant-testutil-%{version}.pom -#Source28: apache-ant-1.7.ant.conf -#Patch0: apache-ant-bz163689.patch -Patch1: apache-ant-1.7.1-gnu-classpath.patch -Patch2: apache-ant-1.7.1-no-test-jar.patch -Patch3: apache-ant-1.8.3-class_path_in_manifest.patch +Source2: apache-ant-bin_ant +Source3: apache-ant-ant.conf +Patch0: apache-ant-1.9.13-ant-1.8.patch License: Apache License 2.0 -BuildRequires: jdk -%if %with_gcj_support -BuildRequires: java-gcj-compat ## AUTOBUILDREQ-BEGIN -BuildRequires: glibc-devel -BuildRequires: libgcc -BuildRequires: libgcj4-devel -BuildRequires: libz-devel +BuildRequires: perl-devel ## AUTOBUILDREQ-END -%endif -%if "%{stage1}" != "1" -BuildRequires: antlr -BuildRequires: apache-ant-antunit -BuildRequires: apache-log4j -BuildRequires: jakarta-bcel -BuildRequires: java-junit3 -BuildRequires: java-depend -BuildRequires: jpackage-utils -BuildRequires: xalan-j2 -BuildRequires: xml-commons-apis -BuildRequires: xml-commons-resolver -%if "%{stage2}" != "1" -BuildRequires: xerces-j2 -BuildRequires: apache-anakia -BuildRequires: apache-tomcat5-servletapi5 -BuildRequires: apache-velocity-dvsl -BuildRequires: apache-xml-stylebook -BuildRequires: jakarta-bsf24 -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-httpclient -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-net2 -BuildRequires: jakarta-oro -BuildRequires: jakarta-regexp -BuildRequires: java-bsh2 -BuildRequires: java-classpathx-jaf -BuildRequires: java-classpathx-mail -BuildRequires: java-dom4j -# jacl/jacl jacl/tcljava -BuildRequires: java-jacl -BuildRequires: java-junit48 -BuildRequires: java-rhino -BuildRequires: java-ruby -BuildRequires: java-sch41 -# NON FREE -%if %sun_jai -BuildRequires: java-sun-jai -%endif -BuildRequires: java-sun-jms -BuildRequires: java-velocity -BuildRequires: java-xdoclet -BuildRequires: jython -BuildRequires: xjavadoc -BuildRequires: xml-commons-which10 -BuildRequires: java-gcj-compat-python -%endif -%if "%{stage2}" != "1" -Requires: xerces-j2 -%endif -Requires: xalan-j2 -Requires: xml-commons-apis -%endif +BuildRequires: java-openjdk +BuildRequires: java-junit +Requires: java-junit Obsoletes: apache-ant-nodeps Provides: apache-ant-nodeps = %{?epoch:%epoch:}%{version}-%{release} Obsoletes: apache-ant-trax @@ -137,246 +27,52 @@ Obsoletes: apache-ant-stylebook Provides: apache-ant-stylebook = %{?epoch:%epoch:}%{version}-%{release} Obsoletes: apache-ant-testutil Provides: apache-ant-testutil = %{?epoch:%epoch:}%{version}-%{release} +Provides: apache-ant-jmf +Obsoletes: apache-ant-jmf +Provides: apache-ant-swing +Obsoletes: apache-ant-swing +Provides: apache-ant-antlr +Provides: apache-ant-bsf +Obsoletes: apache-ant-bsf +Provides: apache-ant-resolver +Obsoletes: apache-ant-resolver +Provides: apache-ant-commons-logging +Obsoletes: apache-ant-commons-logging +Provides: apache-ant-commons-net +Obsoletes: apache-ant-commons-net +Provides: apache-ant-jai +Obsoletes: apache-ant-jai +Provides: apache-ant-bcel +Obsoletes: apache-ant-bcel +Provides: apache-ant-log4j +Obsoletes: apache-ant-log4j +Provides: apache-ant-oro +Obsoletes: apache-ant-oro +Provides: apache-ant-regexp +Obsoletes: apache-ant-regexp +Provides: apache-ant-javamail +Obsoletes: apache-ant-javamail +Provides: apache-ant-jdepend +Obsoletes: apache-ant-jdepend +Provides: apache-ant-jsch +Obsoletes: apache-ant-jsch +Provides: apache-ant-junit +Obsoletes: apache-ant-junit +Provides: apache-ant-xalan2 +Obsoletes: apache-ant-xalan2 +Provides: apache-ant-scripts +Obsoletes: apache-ant-scripts +Provides: apache-ant-manual +Obsoletes: apache-ant-manual +Provides: apache-ant-javadoc +Obsoletes: apache-ant-javadoc +Provides: apache-ant-regexp +Obsoletes: apache-ant-regexp BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Apache Ant is a Java-based build tool. In theory, it is kind of like Make, but without Make's wrinkles. -%package jmf -Summary: Optional jmf tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} - -%description jmf -Optional jmf tasks for ant. - -##%package nodeps -##Summary: Optional tasks for ant -##Group: Development/Tools -##Requires: %{name} = %{version}-%{release} -## -##%description nodeps -##Optional tasks for ant. - -%package swing -Summary: Optional swing tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} - -%description swing -Optional swing tasks for ant. - -##%package trax -##Summary: Optional trax tasks for ant -##Group: Development/Tools -##Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -##Requires: xalan-j2 -##Provides: %{name}-xalan2 = %{version}-%{release} -## -##%description trax -##Optional trax tasks for ant. - -%package antlr -Summary: Optional antlr tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} - -%description antlr -Optional antlr tasks for ant. - -%package bsf -Summary: Optional apache bsf tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-bsf24 -%endif - -%description bsf -Optional apache bsf tasks for ant. - -%package resolver -Summary: Optional apache resolver tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -Requires: xml-commons-resolver - -%description resolver -Optional apache resolver tasks for ant. - -%package commons-logging -Summary: Optional commons logging tasks for ant -Group: Development/Tools -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-commons-logging -%endif - -%description commons-logging -Optional commons logging tasks for ant. - -%package commons-net -Summary: Optional commons net tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-commons-net2 -%endif - -%description commons-net -Optional commons net tasks for ant. - -%if %sun_jai -%package jai -Summary: Optional jai tasks for Apache Ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -Requires: java-sun-jai - -%description jai -Optional jai tasks for Apache Ant -%endif - -%package bcel -Summary: Optional apache bcel tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-bcel -%endif - -%description bcel -Optional apache bcel tasks for ant. - -%package log4j -Summary: Optional apache log4j tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -Requires: apache-log4j - -%description log4j -Optional apache log4j tasks for ant. - -%package oro -Summary: Optional apache oro tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-oro -%endif - -%description oro -Optional apache oro tasks for ant. - -%package regexp -Summary: Optional apache regexp tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: jakarta-regexp -%endif - -%description regexp -Optional apache regexp tasks for ant. - -%package javamail -Summary: Optional javamail tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: java-classpathx-mail -Requires: java-classpathx-jaf -%endif - -%description javamail -Optional javamail tasks for ant. - -%package jdepend -Summary: Optional jdepend tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: java-depend -%endif - -%description jdepend -Optional jdepend tasks for ant. - -%package jsch -Summary: Optional jsch tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: java-sch41 -%endif - -%description jsch -Optional jsch tasks for ant. - -%package junit -Summary: Optional junit tasks for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -##Requires: %{name}-nodeps = %{version}-%{release} -%if "%{stage2}" != "1" -Requires: java-junit48 -%endif - -%description junit -Optional junit tasks for ant. - -##%package stylebook -##Summary: Stylebook tasks support for ant -##Group: Development/Tools -##Requires: %{name} = %{version}-%{release} -##Requires: apache-xml-stylebook -## -##%description stylebook -##Optional stylebook tasks for ant, - -##%package testutil -##Summary: Test utility classes for ant -##Group: Development/Tools -##Requires: %{name} = %{version}-%{release} -##Requires: java-junit3 -## -##%description testutil -##Optional test utility classes for ant, - -%package xalan2 -Summary: Xalan-J2 tasks support for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: xalan-j2 - -%description xalan2 -Optional Xalan-J2 tasks for ant, - -%package scripts -Summary: Additional scripts for ant -Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: %{__perl} -Requires: %{__python} - -%description scripts -Additional Perl and Python scripts for ant. - %package manual Summary: Manual for ant Group: Documentation @@ -384,841 +80,116 @@ Group: Documentation %description manual Documentation for ant. -%package javadoc -Summary: Javadoc for ant -Group: Documentation - -%description javadoc -Javadoc for ant. - %prep %setup -q -# -D -T -#:<< ___EOF -# disable ant kaffe support and enable gnu-classpath/libgcj -%if ! %kaffe -%patch1 -p1 -%endif -%if %bootstrap -# bootstrap -%patch2 -p1 -%endif -# Fix class-path-in-manifest rpmlint warning -%patch3 -p0 - -#https://issues.apache.org/bugzilla/show_bug.cgi?id=47669 -sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java - -%if "%{stage1}" != "1" -# clean jar files -find . -name "*.jar" | %{_bindir}/xargs -t rm -%endif - -# 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 - -# Provides: exclude perl(oata), perl(examples) -cat <<__EOF__ > ant-perl.prov -#!/bin/sh -/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$' -__EOF__ -%define __perl_provides %{_builddir}/%{name}-%{version}/ant-perl.prov -chmod +x %{__perl_provides} - - -# Requires: exclude bogus perl(the) -cat <<__EOF__ > ant-perl.req -#!/bin/sh -/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$' -__EOF__ -%define __perl_requires %{_builddir}/%{name}-%{version}/ant-perl.req -chmod +x %{__perl_requires} +%patch0 -p1 %build -#:<< ___EOF -export JAVA_HOME=%{_jvmdir}/jdk -export CLASSPATH="%{_datadir}/java/ecj.jar" -%if "%{stage1}" != "1" -%if %sun_jai - CLASSPATH=$CLASSPATH:$(build-classpath jai) +# ant needs HOME to download libs to $HOME/.m2/repository +export ANT_OPTS="-Duser.home=`pwd`" +%ifarch arm +export LD_PRELOAD=%{_libdir}/libatomic.so.1 %endif -CLASSPATH=$CLASSPATH:$(build-classpath xalan-j2-interpretive xalan-j2-serializer) -%if "%{stage2}" != "1" - CLASSPATH=$CLASSPATH:$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis bcel commons-logging bsf24) - CLASSPATH=$CLASSPATH:$(build-classpath classpathx-jaf classpathx-mail/mail-1.3.1-api-1.1.1) - CLASSPATH=$CLASSPATH:$(build-classpath classpathx-mail/mail-1.3.1-providers-1.1.1 jdepend) - CLASSPATH=$CLASSPATH:$(build-classpath oro regexp commons-net2 jsch commons-httpclient log4j) - CLASSPATH=$CLASSPATH:$(build-classpath xml-commons-resolver xml-stylebook jms rhino antlr) - CLASSPATH=$CLASSPATH:$(build-classpath junit-3.8.2 junit48 jython jruby xml-commons-which10) - CLASSPATH=$CLASSPATH:$(build-classpath commons-logging-api bsh2/bsh-core bsh2/bsh anakia) - CLASSPATH=$CLASSPATH:$(build-classpath ant-antunit jacl/jacl jacl/tcljava servletapi5) - CLASSPATH=$CLASSPATH:$(build-classpath dom4j velocity-dvsl commons-collections xdoclet xjavadoc) -%else - CLASSPATH=$CLASSPATH:$(build-classpath ant-antunit log4j bcel junit-3.8.2 jdepend) - CLASSPATH=$CLASSPATH:$(build-classpath xml-commons-resolver xml-commons-apis antlr) -%endif # ! stage2 -%endif # ! stage1 +ant -Ddest=optional -f fetch.xml -IFS=':' -for f in $CLASSPATH; do - ln -s $f lib/optional/ -done -IFS= +rm lib/optional/junit-4.12.jar +ln -s %{_javadir}/junit.jar lib/optional/junit-4.12.jar +rm lib/optional/hamcrest-core-1.3.jar +ln -s %{_javadir}/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar -%if ! %bootstrap - - export OPT_JAR_LIST=: - CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar - %{ant} \ - jars \ - %if %test_jar - test-jar - %endif - CLASSPATH=$CLASSPATH - %{ant} javadocs -%else - CLASSPATH=$CLASSPATH - sh ./build.sh --noconfig \ - jars \ - %if %test_jar - test-jar \ - %endif - %if "%{stage1}" != "1" - javadocs - %endif -%endif +ant dist %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -mkdir -p %{buildroot}%{anthome} -mkdir -p %{buildroot}%{_javadir}/ant -mkdir -p %{buildroot}%{antlib} -mkdir -p %{buildroot}%{antetc}/checkstyle -mkdir -p %{buildroot}%{antlib} -mkdir -p %{buildroot}%{_datadir}/maven2/poms +cd %{name}-%{version} -install -m 644 build/lib/ant.jar %{buildroot}%{_javadir}/ant-%{version}.jar -install -m 644 build/lib/ant-bootstrap.jar %{buildroot}%{_javadir}/ant-bootstrap-%{version}.jar -install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-ant.pom -%add_to_maven_depmap org.apache.ant ant %{version} JPP ant -install -m 644 build/lib/ant-launcher.jar %{buildroot}%{_javadir}/ant-launcher-%{version}.jar -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/maven2/poms/JPP-ant-launcher.pom -%add_to_maven_depmap org.apache.ant ant-launcher %{version} JPP ant-launcher +install -dm755 %{buildroot}%{_datadir}/apache-ant -install -m 644 build/lib/ant-jmf.jar %{buildroot}%{_javadir}/ant/ant-jmf-%{version}.jar -install -m 644 %{SOURCE20} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-jmf.pom -%add_to_maven_depmap org.apache.ant ant-jmf %{version} JPP/ant ant-jmf -##install -m 644 build/lib/ant-nodeps.jar %{buildroot}%{_javadir}/ant/ant-nodeps-%{version}.jar -##install -m 644 %{SOURCE23} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-nodeps.pom -%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP/ant ant-nodeps -install -m 644 build/lib/ant-swing.jar %{buildroot}%{_javadir}/ant/ant-swing-%{version}.jar -install -m 644 %{SOURCE24} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-swing.pom -%add_to_maven_depmap org.apache.ant ant-swing %{version} JPP/ant ant-swing -##install -m 644 build/lib/ant-trax.jar %{buildroot}%{_javadir}/ant/ant-trax-%{version}.jar -##install -m 644 %{SOURCE25} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-trax.pom -%add_to_maven_depmap org.apache.ant ant-trax %{version} JPP/ant ant-trax +install -dm755 %{buildroot}%{_sysconfdir}/apache-ant +cp -Rp etc/* %{buildroot}%{_sysconfdir}/apache-ant/ -# optional -%if "%{stage1}" != "1" -##install -m 644 build/lib/ant-stylebook.jar %{buildroot}%{_javadir}/ant/ant-stylebook-%{version}.jar -## install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-stylebook.pom -## %add_to_maven_depmap org.apache.ant ant-stylebook %{version} JPP/ant ant-stylebook -install -m 644 build/lib/ant-antlr.jar %{buildroot}%{_javadir}/ant/ant-antlr-%{version}.jar -install -m 644 %{SOURCE8} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-antlr.pom -%add_to_maven_depmap org.apache.ant ant-antlr %{version} JPP/ant ant-antlr -install -m 644 build/lib/ant-apache-bsf.jar %{buildroot}%{_javadir}/ant/ant-apache-bsf-%{version}.jar -install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-bsf.pom -%add_to_maven_depmap org.apache.ant ant-apache-bsf %{version} JPP/ant ant-apache-bsf -install -m 644 build/lib/ant-apache-resolver.jar %{buildroot}%{_javadir}/ant/ant-apache-resolver-%{version}.jar -install -m 644 %{SOURCE10} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-resolver.pom -%add_to_maven_depmap org.apache.ant ant-apache-resolver %{version} JPP/ant ant-apache-resolver -install -m 644 build/lib/ant-commons-logging.jar %{buildroot}%{_javadir}/ant/ant-commons-logging-%{version}.jar -install -m 644 %{SOURCE11} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-commons-logging.pom -%add_to_maven_depmap org.apache.ant ant-commons-logging %{version} JPP/ant ant-commons-logging -install -m 644 build/lib/ant-commons-net.jar %{buildroot}%{_javadir}/ant/ant-commons-net-%{version}.jar -install -m 644 %{SOURCE12} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-commons-net.pom -%add_to_maven_depmap org.apache.ant ant-commons-net %{version} JPP/ant ant-commons-net -%if %sun_jai - install -m 644 build/lib/ant-jai.jar %{buildroot}%{_javadir}/ant/ant-jai-%{version}.jar - %add_to_maven_depmap org.apache.ant ant-jai %{version} JPP/ant ant-jai - install -m 644 %{SOURCE13} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-jai.pom -%endif -install -m 644 build/lib/ant-apache-bcel.jar %{buildroot}%{_javadir}/ant/ant-apache-bcel-%{version}.jar -install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom -%add_to_maven_depmap org.apache.ant ant-apache-bcel %{version} JPP/ant ant-apache-bcel -install -m 644 build/lib/ant-apache-log4j.jar %{buildroot}%{_javadir}/ant/ant-apache-log4j-%{version}.jar -install -m 644 %{SOURCE15} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom -%add_to_maven_depmap org.apache.ant ant-apache-log4j %{version} JPP/ant ant-apache-log4j -install -m 644 build/lib/ant-apache-oro.jar %{buildroot}%{_javadir}/ant/ant-apache-oro-%{version}.jar -install -m 644 %{SOURCE16} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom -%add_to_maven_depmap org.apache.ant ant-apache-oro %{version} JPP/ant ant-apache-oro -install -m 644 build/lib/ant-apache-regexp.jar %{buildroot}%{_javadir}/ant/ant-apache-regexp-%{version}.jar -install -m 644 %{SOURCE17} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom -%add_to_maven_depmap org.apache.ant ant-apache-regexp %{version} JPP/ant ant-apache-regexp -ln -sf ant-apache-bcel.jar %{buildroot}%{_javadir}/ant/ant-jakarta-bcel.jar -ln -sf ant-apache-log4j.jar %{buildroot}%{_javadir}/ant/ant-jakarta-log4j.jar -ln -sf ant-apache-oro.jar %{buildroot}%{_javadir}/ant/ant-jakarta-oro.jar -ln -sf ant-apache-regexp.jar %{buildroot}%{_javadir}/ant/ant-jakarta-regexp.jar -install -m 644 build/lib/ant-javamail.jar %{buildroot}%{_javadir}/ant/ant-javamail-%{version}.jar -install -m 644 %{SOURCE18} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-javamail.pom -%add_to_maven_depmap org.apache.ant ant-javamail %{version} JPP/ant ant-javamail -install -m 644 build/lib/ant-jdepend.jar %{buildroot}%{_javadir}/ant/ant-jdepend-%{version}.jar -install -m 644 %{SOURCE19} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-jdepend.pom -%add_to_maven_depmap org.apache.ant ant-jdepend %{version} JPP/ant ant-jdepend -install -m 644 build/lib/ant-jsch.jar %{buildroot}%{_javadir}/ant/ant-jsch-%{version}.jar -install -m 644 %{SOURCE21} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-jsch.pom -%add_to_maven_depmap org.apache.ant ant-jsch %{version} JPP/ant ant-jsch -install -m 644 build/lib/ant-junit.jar %{buildroot}%{_javadir}/ant/ant-junit-%{version}.jar -install -m 644 %{SOURCE22} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-junit.pom -%add_to_maven_depmap org.apache.ant ant-junit %{version} JPP/ant ant-junit -%endif -##install -m 644 build/lib/ant-testutil.jar %{buildroot}%{_javadir}/ant/ant-testutil-%{version}.jar -install -m 644 %{SOURCE27} %{buildroot}%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom -%add_to_maven_depmap org.apache.ant ant-testutil %{version} JPP/ant ant-testutil -install -m 644 %{SOURCE26} %{buildroot}%{_datadir}/maven2/poms/JPP-ant-parent.pom -%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent +rm -f %{buildroot}%{_sysconfdir}/apache-ant/ant-bootstrap.jar +ln -s %{_sysconfdir}/apache-ant %{buildroot}%{_datadir}/apache-ant/etc -( - cd %{buildroot}%{_javadir} - for jar in *-%{version}.jar; do - jarname=`echo $jar| sed "s|-%{version}||g"` - ln -sf ${jar} ${jarname} - ln -sf ../../java/${jarname} %{buildroot}%{antlib}/${jarname} - done -) +install -dm755 %{buildroot}%{_datadir}/apache-ant/bin +find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 {} %{buildroot}%{_datadir}/apache-ant/bin \; -( - cd %{buildroot}%{_javadir}/ant - for jar in *-%{version}.jar; do - jarname=`echo $jar| sed "s|-%{version}||g"` - ln -sf ${jar} ${jarname} - ln -sf ../../java/ant/${jarname} %{buildroot}%{antlib}/${jarname} - done -) -# scripts: remove DOS and OS/2 scripts -rm -f src/script/*.bat -rm -f src/script/*.cmd +install -Dm755 %{SOURCE2} %{buildroot}%{_bindir}/ant +install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apache-ant/ant.conf -mkdir -p %{buildroot}%{antbin} -mkdir -p %{buildroot}%{_bindir} +install -dm755 %{buildroot}%{_javadir}/apache-ant +install -m644 lib/*.jar %{buildroot}%{_javadir}/apache-ant/ +ln -s %{_javadir}/apache-ant %{buildroot}%{_datadir}/apache-ant/lib -cp -p src/script/* %{buildroot}%{antbin} +# install profile.d script +install -dm755 %{buildroot}%{_sysconfdir}/profile.d +cat > %{buildroot}%{_sysconfdir}/profile.d/apache-ant.sh << _EOF +export ANT_HOME=%{_datadir}/apache-ant +_EOF -cp -p src/etc/*.xsl %{buildroot}%{antetc}/ +cat > %{buildroot}%{_sysconfdir}/profile.d/apache-ant.csh << _EOF +setenv ANT_HOME %{_datadir}/apache-ant +_EOF -%if "%{stage1}" == "1" - rm -f %{buildroot}%{antetc}/jdepend*.xsl - rm -f %{buildroot}%{antetc}/maudit-frames.xsl -%else -cp -p src/etc/checkstyle/* %{buildroot}%{antetc}/checkstyle - -mkdir -p %{buildroot}%{_javadocdir}/ant-%{version} -cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant-%{version} - -( - cd manual - ln -sf %{_javadocdir}/%{name}-%{version} api -) -%endif - -mkdir -p %{buildroot}%{_sysconfdir}/ant.d -##echo "xalan-j2 ant/ant-trax xalan-j2-serializer" > %{buildroot}%{_sysconfdir}/ant.d/trax -#echo "xalan-j2 ant/ant-trax xalan-j2-serializer" > %{buildroot}%{_sysconfdir}/ant.d/xalan -echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/ant.d/jmf -##echo "ant/ant-nodeps" > %{buildroot}%{_sysconfdir}/ant.d/nodeps -echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/ant.d/swing -%if "%{stage1}" != "1" -echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr -echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "bsf24 ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf -echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging -echo "jakarta-commons-net2 ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net -echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail -echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend -echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j -echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro -echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp -echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -##echo "xml-stylebook ant/ant-stylebook" > %{buildroot}%{_sysconfdir}/ant.d/stylebook -##echo "ant junit48" > %{buildroot}%{_sysconfdir}/ant.d/testutil -%if %sun_jai -echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai -%endif -echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit -%endif - -install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/ant.sh -sed --in-place "s|__ANT__HOME__|%{anthome}|" %{buildroot}%{_sysconfdir}/profile.d/ant.sh - -%if %with_gcj_support -%{_bindir}/aot-compile-rpm -%endif +install -dm755 %{buildroot}%{_docdir}/apache-ant +cp -r manual/* %{buildroot}%{_docdir}/apache-ant/ %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%post -%update_maven_depmap -%if %with_gcj_support -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif -%{_sysconfdir}/profile.d/ant.sh -exit 0 - -%postun -%update_maven_depmap -%if %with_gcj_support -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files %defattr(-,root,root) -%{_sysconfdir}/profile.d/ant.sh -%dir %{antbin} -%attr(0755,root,root) %{antbin}/ant -%attr(0755,root,root) %{antbin}/antRun -%{_javadir}/ant-%{version}.jar -%{_javadir}/ant.jar -%{_javadir}/ant-bootstrap-%{version}.jar -%{_javadir}/ant-bootstrap.jar -%{_javadir}/ant-launcher-%{version}.jar -%{_javadir}/ant-launcher.jar -%dir %{anthome} -%dir %{antetc} -%{antetc}/checkstyle -%{antetc}/ant-update.xsl -%{antetc}/changelog.xsl -%{antetc}/common2master.xsl -%{antetc}/junit-frames-xalan1.xsl -%{antetc}/junit-frames.xsl -%{antetc}/junit-noframes.xsl -%{antetc}/log.xsl -%{antetc}/tagdiff.xsl -%{antetc}/mmetrics-frames.xsl -%{antetc}/coverage-frames.xsl -%{antetc}/printFailingTests.xsl -%dir %{antlib} -%{antlib}/ant.jar -%{antlib}/ant-bootstrap.jar -%{antlib}/ant-launcher.jar -%dir %{_javadir}/ant -%dir %{_sysconfdir}/ant.d -%{_datadir}/maven2/poms -%{_mavendepmapfragdir} -%doc INSTALL LICENSE README WHATSNEW -%if %with_gcj_support -%dir %{_libdir}/gcj/apache-ant -%{_libdir}/gcj/apache-ant/ant-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-%{version}.jar.so -%{_libdir}/gcj/apache-ant/ant-launcher-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-launcher-%{version}.jar.so -%endif - -%if %with_gcj_support -%post jmf -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun jmf -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files jmf -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_javadir}/ant/ant-jmf.jar -%{_javadir}/ant/ant-jmf-%{version}.jar -%{antlib}/ant-jmf.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-jmf-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-jmf-%{version}.jar.so -%endif - -##%post nodeps -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -## -##%postun nodeps -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -##%endif -## -##%files nodeps -##%defattr(-,root,root) -##%config(noreplace) %{_sysconfdir}/ant.d/nodeps -##%{_javadir}/ant/ant-nodeps.jar -##%{_javadir}/ant/ant-nodeps-%{version}.jar -##%{antlib}/ant-nodeps.jar -##%if %with_gcj_support -##%{_libdir}/gcj/apache-ant/ant-nodeps-%{version}.jar.db -##%{_libdir}/gcj/apache-ant/ant-nodeps-%{version}.jar.so - -%if %with_gcj_support -%post swing -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun swing -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files swing -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/swing -%{_javadir}/ant/ant-swing.jar -%{_javadir}/ant/ant-swing-%{version}.jar -%{antlib}/ant-swing.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-swing-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-swing-%{version}.jar.so -%endif - -##%post trax -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -## -##%postun trax -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -##%endif -## -##%files trax -##%defattr(-,root,root) -##%config(noreplace) %{_sysconfdir}/ant.d/trax -##%{antetc}/mmetrics-frames.xsl -##%{antetc}/coverage-frames.xsl -##%{_javadir}/ant/ant-trax.jar -##%{_javadir}/ant/ant-trax-%{version}.jar -##%{antlib}/ant-trax.jar -##%if %with_gcj_support -##%{_libdir}/gcj/apache-ant/ant-trax-%{version}.jar.db -##%{_libdir}/gcj/apache-ant/ant-trax-%{version}.jar.so -##%endif - -%if %with_gcj_support -%post antlr -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun antlr -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if "%{stage1}" != "1" -%files antlr -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/antlr -%{_javadir}/ant/ant-antlr.jar -%{_javadir}/ant/ant-antlr-%{version}.jar -%{antlib}/ant-antlr.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-antlr-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-antlr-%{version}.jar.so -%endif -%if %with_gcj_support -%post bsf -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun bsf -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files bsf -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf -%{_javadir}/ant/ant-apache-bsf.jar -%{_javadir}/ant/ant-apache-bsf-%{version}.jar -%{antlib}/ant-apache-bsf.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-bsf-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-bsf-%{version}.jar.so -%endif -%endif - -%if %with_gcj_support -%post resolver -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun resolver -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files resolver -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver -%{_javadir}/ant/ant-apache-resolver.jar -%{_javadir}/ant/ant-apache-resolver-%{version}.jar -%{antlib}/ant-apache-resolver.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-resolver-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-resolver-%{version}.jar.so -%endif - -%if %with_gcj_support -%post commons-logging -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun commons-logging -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files commons-logging -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/commons-logging -%{_javadir}/ant/ant-commons-logging.jar -%{_javadir}/ant/ant-commons-logging-%{version}.jar -%{antlib}/ant-commons-logging.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-commons-logging-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-commons-logging-%{version}.jar.so -%endif -%endif -%if %with_gcj_support -%post commons-net -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun commons-net -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files commons-net -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/commons-net -%{_javadir}/ant/ant-commons-net.jar -%{_javadir}/ant/ant-commons-net-%{version}.jar -%{antlib}/ant-commons-net.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-commons-net-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-commons-net-%{version}.jar.so -%endif -%endif - -%if %sun_jai -%if %with_gcj_support -%post jai -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun jai -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files jai -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/jai -%{_javadir}/ant/ant-jai.jar -%{_javadir}/ant/ant-jai-%{version}.jar -%{antlib}/ant-jai.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-jai-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-jai-%{version}.jar.so -%endif -%endif - -%if %with_gcj_support -%post bcel -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun bcel -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files bcel -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel -%{_javadir}/ant/ant-apache-bcel.jar -%{_javadir}/ant/ant-apache-bcel-%{version}.jar -%{_javadir}/ant/ant-jakarta-bcel.jar -%{antlib}/ant-apache-bcel.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-bcel-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-bcel-%{version}.jar.so -%endif - -%if %with_gcj_support -%post log4j -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun log4j -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files log4j -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j -%{_javadir}/ant/ant-apache-log4j.jar -%{_javadir}/ant/ant-apache-log4j-%{version}.jar -%{_javadir}/ant/ant-jakarta-log4j.jar -%{antlib}/ant-apache-log4j.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-log4j-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-log4j-%{version}.jar.so -%endif - -%if %with_gcj_support -%post oro -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun oro -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files oro -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-oro -%{antetc}/maudit-frames.xsl -%{_javadir}/ant/ant-apache-oro.jar -%{_javadir}/ant/ant-apache-oro-%{version}.jar -%{_javadir}/ant/ant-jakarta-oro.jar -%{antlib}/ant-apache-oro.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-oro-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-oro-%{version}.jar.so -%endif -%endif - -%if %with_gcj_support -%post regexp -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun regexp -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files regexp -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp -%{_javadir}/ant/ant-apache-regexp.jar -%{_javadir}/ant/ant-apache-regexp-%{version}.jar -%{_javadir}/ant/ant-jakarta-regexp.jar -%{antlib}/ant-apache-regexp.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-apache-regexp-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-apache-regexp-%{version}.jar.so -%endif -%endif - -%if %with_gcj_support -%post javamail -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun javamail -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files javamail -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/javamail -%{_javadir}/ant/ant-javamail.jar -%{_javadir}/ant/ant-javamail-%{version}.jar -%{antlib}/ant-javamail.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-javamail-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-javamail-%{version}.jar.so -%endif -%endif - -%if %with_gcj_support -%post jdepend -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun jdepend -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files jdepend -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/jdepend -%{antetc}/jdepend.xsl -%{antetc}/jdepend-frames.xsl -%{_javadir}/ant/ant-jdepend.jar -%{_javadir}/ant/ant-jdepend-%{version}.jar -%{antlib}/ant-jdepend.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-jdepend-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-jdepend-%{version}.jar.so -%endif - -%if %with_gcj_support -%post jsch -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun jsch -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files jsch -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/jsch -%{_javadir}/ant/ant-jsch.jar -%{_javadir}/ant/ant-jsch-%{version}.jar -%{antlib}/ant-jsch.jar -%if "%{stage2}" != "1" -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-jsch-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-jsch-%{version}.jar.so -%endif -%endif - -##%if %with_gcj_support -##%post stylebook -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi - -##%postun stylebook -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -##%endif - -##%files stylebook -##%defattr(-,root,root) -##%config(noreplace) %{_sysconfdir}/ant.d/stylebook -##%{antetc}/checkstyle -##%{_javadir}/ant/ant-stylebook-%{version}.jar -##%{_javadir}/ant/ant-stylebook.jar -##%{antlib}/ant-stylebook.jar -##%if %with_gcj_support -##%{_libdir}/gcj/apache-ant/ant-stylebook-%{version}.jar.db -##%{_libdir}/gcj/apache-ant/ant-stylebook-%{version}.jar.so - -##%post testutil -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -## -##%postun testutil -##if [ -x %{_bindir}/rebuild-gcj-db ]; then -## %{_bindir}/rebuild-gcj-db -##fi -##%endif - -##%files testutil -##%defattr(-,root,root) -##%config(noreplace) %{_sysconfdir}/ant.d/testutil -##%{_javadir}/ant/ant-testutil-%{version}.jar -##%{_javadir}/ant/ant-testutil.jar -##%{antlib}/ant-testutil.jar -##%if %with_gcj_support -##%{_libdir}/gcj/apache-ant/ant-testutil-%{version}.jar.db -##%{_libdir}/gcj/apache-ant/ant-testutil-%{version}.jar.so -##%endif - -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/ant-%{version} - -%if %with_gcj_support -%post junit -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun junit -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%files junit -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/ant.d/junit -%{_javadir}/ant/ant-junit.jar -%{_javadir}/ant/ant-junit-%{version}.jar -%{antlib}/ant-junit.jar -%if %with_gcj_support -%{_libdir}/gcj/apache-ant/ant-junit-%{version}.jar.db -%{_libdir}/gcj/apache-ant/ant-junit-%{version}.jar.so -%endif - -# endif for stage1 != 1 -%endif - -%files scripts -%defattr(-,root,root) -%attr(0755,root,root) %{antbin}/*.pl -%attr(0755,root,root) %{antbin}/*.py* +%dir %{_sysconfdir}/apache-ant +%config %{_sysconfdir}/apache-ant/ant.conf +%{_sysconfdir}/apache-ant/* +%{_sysconfdir}/profile.d/apache-ant.sh +%{_sysconfdir}/profile.d/apache-ant.csh +%{_bindir}/ant +%dir %{_datadir}/java/apache-ant +%{_datadir}/java/apache-ant/ant-antlr.jar +%{_datadir}/java/apache-ant/ant-apache-bcel.jar +%{_datadir}/java/apache-ant/ant-apache-bsf.jar +%{_datadir}/java/apache-ant/ant-apache-log4j.jar +%{_datadir}/java/apache-ant/ant-apache-oro.jar +%{_datadir}/java/apache-ant/ant-apache-regexp.jar +%{_datadir}/java/apache-ant/ant-apache-resolver.jar +%{_datadir}/java/apache-ant/ant-apache-xalan2.jar +%{_datadir}/java/apache-ant/ant-commons-logging.jar +%{_datadir}/java/apache-ant/ant-commons-net.jar +%{_datadir}/java/apache-ant/ant-jai.jar +%{_datadir}/java/apache-ant/ant-javamail.jar +%{_datadir}/java/apache-ant/ant-jdepend.jar +%{_datadir}/java/apache-ant/ant-jmf.jar +%{_datadir}/java/apache-ant/ant-jsch.jar +%{_datadir}/java/apache-ant/ant-junit.jar +%{_datadir}/java/apache-ant/ant-junit4.jar +%{_datadir}/java/apache-ant/ant-launcher.jar +%{_datadir}/java/apache-ant/ant-netrexx.jar +%{_datadir}/java/apache-ant/ant-swing.jar +%{_datadir}/java/apache-ant/ant-testutil.jar +%{_datadir}/java/apache-ant/ant.jar +%{_datadir}/apache-ant/bin/ant +%{_datadir}/apache-ant/bin/antRun +%{_datadir}/apache-ant/bin/antRun.pl +%{_datadir}/apache-ant/bin/complete-ant-cmd.pl +%{_datadir}/apache-ant/bin/runant.pl +%{_datadir}/apache-ant/bin/runant.py +%{_datadir}/apache-ant/etc +%{_datadir}/apache-ant/lib %files manual %defattr(-,root,root) -%doc manual/* +%dir %{_docdir}/apache-ant +%{_docdir}/apache-ant/* %changelog +* Fri Aug 10 2018 Silvan Calarco 1.9.13-2mamba +- fixed installation paths + +* Wed Aug 08 2018 Silvan Calarco 1.9.13-1mamba +- update to 1.9.13 + * Fri Jun 14 2013 Silvan Calarco 1.8.4-2mamba - fix build with optional libraries. CLASSPATH is ignored (why?), needs symlnks in lib/optional - fixes: the class org.apache.tools.ant.taskdefs.optional.junit.JUnitTask was not found.