From 90072d3de85273bdf68dba4609e05ffd61218ee87195930bb7d96c43125cfbb2 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 9 Mar 2011 09:05:56 +0000 Subject: [PATCH] - Update to ant 1.8.2 * performance improvements in directory scanning * XSLT task honors classpath again (bugrep 49271) * distinction between core tasks and optional tasks is abolished * new task augment allows to add attributes or nested elements to previously defined references * Lexically scoped local properties, i.e. properties that are only defined inside a target, sequential block or similar environment. This is very useful inside of s where a macro can now define a temporary property that will disappear once the task has finished. * can now import from any file- or URL-providing resource - this includes . This means can read build file snippets from JARs or fixed server URLs. There are several other improvements in the area of import. * Various improvements to the directory scanning code that help with symbolic link cycles (as can be found on MacOS X Java installations for example) and improve scanning performance. For big directory trees the improvement is dramatic. * The way developers can extend Ant's property expansion algorithm has been rewritten (breaking the older API) to be easier to use and be more powerful. The whole local properties mechanism is implemented using that API and could be implemented in a separate library without changes in Ant's core. Things like the yet-to-be-released props Antlib can now provide often required "scripty" fuctions without touching Ant itself. At the same time the if and unless attributes have been rewritten to do the expected thing if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a property named "true" existed). This adds "testing conditions" as a new use-case to property expansion. * A new top-level element assists in writing re-usable build files that are meant to be imported. has a name and a dependency-list like and can be used like a from the command line or a dependency-list but the importing build file can add targets to the 's depends list. * Ant now requires Java 1.4 or later new task include provides an alternative to that should be preferred when you don't want to override any targets * numerous bug fixes and improvements as documented in Bugzilla and in WHATSNEW - merge the nodeps and trax packages to main one - build ant-antlr.spec using openjdk - add ant-apache-xalan2 and ant-testutil OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=16 --- README.PACKAGER | 1 - ant-1.7.1.pom | 232 ------ ant-antlr-1.7.1.pom | 75 -- ant-antlr-prepare.sh | 35 - ant-antlr.changes | 5 - ant-antlr.spec | 724 ++++++++---------- ant-apache-bcel-1.7.1.pom | 71 -- ant-apache-bsf-1.7.1.pom | 74 -- ant-apache-log4j-1.7.1.pom | 69 -- ant-apache-oro-1.7.1.pom | 71 -- ant-apache-regexp-1.7.1.pom | 70 -- ant-apache-resolver-1.7.1.pom | 69 -- ant-commons-logging-1.7.1.pom | 70 -- ant-commons-net-1.7.1.pom | 72 -- ant-javamail-1.7.1.pom | 78 -- ant-jdepend-1.7.1.pom | 72 -- ant-jmf-1.7.1.pom | 71 -- ant-jsch-1.7.1.pom | 71 -- ant-junit-1.7.1.pom | 94 --- ant-launcher-1.7.1.pom | 57 -- ant-netrexx-1.7.1.pom | 71 -- ant-nodeps-1.7.1.pom | 120 --- ant-parent-1.7.1.pom | 111 --- ant-starteam-1.7.1.pom | 71 -- ant-stylebook-1.7.1.pom | 72 -- ant-swing-1.7.1.pom | 66 -- ant-trax-1.7.1.pom | 94 --- ant-weblogic-1.7.1.pom | 79 -- ant.changes | 50 +- ant.spec | 722 ++++++++--------- apache-ant-1.7.1-src-suse.tar.bz2 | 3 - apache-ant-1.8.2-src.tar.bz2 | 3 + ...nt-1.7.ant.conf => apache-ant-1.8.ant.conf | 2 +- apache-ant-bz163689.patch | 91 +++ apache-ant-class-path-in-manifest.patch | 15 + apache-ant-gnu-classpath.patch | 35 - apache-ant-jars.patch | 18 - apache-ant-no-test-jar.patch | 24 +- apache-ant-source-level.patch | 13 - pre_checkin.sh | 5 + 40 files changed, 816 insertions(+), 2930 deletions(-) delete mode 100644 README.PACKAGER delete mode 100644 ant-1.7.1.pom delete mode 100644 ant-antlr-1.7.1.pom delete mode 100644 ant-antlr-prepare.sh delete mode 100644 ant-apache-bcel-1.7.1.pom delete mode 100644 ant-apache-bsf-1.7.1.pom delete mode 100644 ant-apache-log4j-1.7.1.pom delete mode 100644 ant-apache-oro-1.7.1.pom delete mode 100644 ant-apache-regexp-1.7.1.pom delete mode 100644 ant-apache-resolver-1.7.1.pom delete mode 100644 ant-commons-logging-1.7.1.pom delete mode 100644 ant-commons-net-1.7.1.pom delete mode 100644 ant-javamail-1.7.1.pom delete mode 100644 ant-jdepend-1.7.1.pom delete mode 100644 ant-jmf-1.7.1.pom delete mode 100644 ant-jsch-1.7.1.pom delete mode 100644 ant-junit-1.7.1.pom delete mode 100644 ant-launcher-1.7.1.pom delete mode 100644 ant-netrexx-1.7.1.pom delete mode 100644 ant-nodeps-1.7.1.pom delete mode 100644 ant-parent-1.7.1.pom delete mode 100644 ant-starteam-1.7.1.pom delete mode 100644 ant-stylebook-1.7.1.pom delete mode 100644 ant-swing-1.7.1.pom delete mode 100644 ant-trax-1.7.1.pom delete mode 100644 ant-weblogic-1.7.1.pom delete mode 100644 apache-ant-1.7.1-src-suse.tar.bz2 create mode 100644 apache-ant-1.8.2-src.tar.bz2 rename apache-ant-1.7.ant.conf => apache-ant-1.8.ant.conf (94%) create mode 100644 apache-ant-bz163689.patch create mode 100644 apache-ant-class-path-in-manifest.patch delete mode 100644 apache-ant-gnu-classpath.patch delete mode 100644 apache-ant-jars.patch delete mode 100644 apache-ant-source-level.patch create mode 100644 pre_checkin.sh diff --git a/README.PACKAGER b/README.PACKAGER deleted file mode 100644 index e6f043e..0000000 --- a/README.PACKAGER +++ /dev/null @@ -1 +0,0 @@ -Ant is splitted in two subpackages to avoid circular dependencies (see neededforbuilds of the two spec files) diff --git a/ant-1.7.1.pom b/ant-1.7.1.pom deleted file mode 100644 index f4efd86..0000000 --- a/ant-1.7.1.pom +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant - 1.7.1 - org.apache.tools.ant - Apache Ant - - - org.apache.ant - ant-launcher - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - 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.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/** - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/depend/** - org/apache/tools/ant/util/optional/** - 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/optional/** - org/apache/tools/ant/filters/util/JavaClassHelper* - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/types/resolver/** - org/apache/tools/ant/util/depend/** - org/apache/tools/ant/util/optional/** - 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.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.7.1.pom b/ant-antlr-1.7.1.pom deleted file mode 100644 index 74464a8..0000000 --- a/ant-antlr-1.7.1.pom +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-antlr - 1.7.1 - antlr specific task. - The implementation forks a java process, therefore the antlr jar file is only needed at runtime - - - org.apache.ant - ant - 1.7.1 - true - compile - - - - antlr - antlr - 2.7.2 - true - runtime - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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-antlr-prepare.sh b/ant-antlr-prepare.sh deleted file mode 100644 index 4944999..0000000 --- a/ant-antlr-prepare.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -# This script is based on log4j's jpackage-mini-prepare (thanks to sbrabec@suse.cz) -# create an ant-antlr spec for build of aditional ant plugins -# -#Usage: -# 1.) add these two lines below into the spec file including hash sign (#) -# behind the Name: tag -# # This line is not a comment, please do not remove it! -# #%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) -# 2.) you need to define a bootstrap macro with value 1 -# -# How it works: -# 1.) Was called by rpmbuild (or Re, or should be invoked manually from command line) -# 2.) Rename the package name to ant-antlr -# 3.) Redefine the bootstrap macro to 0 -# 4.) Add an explicit Provides to real name - - -ORIG_SPEC=${2%-antlr} -# Never update -antlr file when it is already opened. It will break advanced build scripts: -if [[ "${2}" != "${ORIG_SPEC}" ]]; then - exit -fi - -if [[ ! -f ${1}/${ORIG_SPEC}.spec ]] ; then - exit -fi - -EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n" -sed "s/^%define bootstrap.*$/${EDIT_WARNING}%define bootstrap 0/; - s/^\(Name:.*\)$/\1-antlr/; - " < ${1}/${ORIG_SPEC}.spec > ${1}/${ORIG_SPEC}-antlr.spec - -#cp -a ${1}/${ORIG_SPEC}.changes ${1}/${ORIG_SPEC}-mini.changes diff --git a/ant-antlr.changes b/ant-antlr.changes index 2ec739d..0acf046 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 4 09:43:06 UTC 2010 - mvyskocil@suse.cz - -- Fix build with antlr-bootstrap - ------------------------------------------------------------------- Fri Apr 9 10:42:30 UTC 2010 - mvyskocil@suse.cz diff --git a/ant-antlr.spec b/ant-antlr.spec index aa8d3aa..2d360d9 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -1,89 +1,89 @@ +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. # -# spec file for package ant-antlr (Version 1.7.1) +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} +%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} +%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} +%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - -%define ant_home %{_datadir}/ant -%define section free -%define cvs_name apache-ant -%define major_version 1.7 ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### -%define bootstrap 0 -%define real_name ant +%global bootstrap 0 + +%if %with bootstrap +%global build_javadoc 0 +%else +%global build_javadoc 1 +%endif + +%global with_manifest_only 0 + +%global ant_home %{_datadir}/ant + +%global major_version 1.8 +%global cvs_version 1.8.2 Name: ant-antlr -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) -Version: 1.7.1 -Release: 15 +Version: 1.8.2 +Release: 0 +License: ASL 2.0 +%if %bootstrap +Summary: Build tool for java +%else Summary: Antlr Task for ant -License: Apache Software License .. -Url: http://jakarta.apache.org/ +%endif +URL: http://ant.apache.org/ Group: Development/Tools/Building -# rm src/etc/testcases/taskdefs/zip/test.exe -Source0: %{cvs_name}-%{version}-src-suse.tar.bz2 -Source2: %{cvs_name}-%{major_version}.ant.conf -Source1: http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom -Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom -Source4: http://repo1.maven.org/maven2/org/apache/ant/ant-netrexx/1.7.1/ant-netrexx-1.7.1.pom -Source5: http://repo1.maven.org/maven2/org/apache/ant/ant-starteam/1.7.1/ant-starteam-1.7.1.pom -Source6: http://repo1.maven.org/maven2/org/apache/ant/ant-stylebook/1.7.1/ant-stylebook-1.7.1.pom -Source7: http://repo1.maven.org/maven2/org/apache/ant/ant-weblogic/1.7.1/ant-weblogic-1.7.1.pom -Source8: http://repo1.maven.org/maven2/org/apache/ant/ant-antlr/1.7.1/ant-antlr-1.7.1.pom -Source9: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bsf/1.7.1/ant-apache-bsf-1.7.1.pom -Source10: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-resolver/1.7.1/ant-apache-resolver-1.7.1.pom -Source11: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom -Source12: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom -#Source13: http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom -Source14: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom -Source15: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom -Source16: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-oro/1.7.1/ant-apache-oro-1.7.1.pom -Source17: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-regexp/1.7.1/ant-apache-regexp-1.7.1.pom -Source18: http://repo1.maven.org/maven2/org/apache/ant/ant-javamail/1.7.1/ant-javamail-1.7.1.pom -Source19: http://repo1.maven.org/maven2/org/apache/ant/ant-jdepend/1.7.1/ant-jdepend-1.7.1.pom -Source20: http://repo1.maven.org/maven2/org/apache/ant/ant-jmf/1.7.1/ant-jmf-1.7.1.pom -Source21: http://repo1.maven.org/maven2/org/apache/ant/ant-jsch/1.7.1/ant-jsch-1.7.1.pom -Source22: http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.1/ant-junit-1.7.1.pom -Source23: http://repo1.maven.org/maven2/org/apache/ant/ant-nodeps/1.7.1/ant-nodeps-1.7.1.pom -Source24: http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant-swing-1.7.1.pom -Source25: http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom -Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom -Source1000: ant-antlr-prepare.sh -Source1001: README.PACKAGER -# Fix some places where copies of classes are included in the wrong jarfiles -Patch0: apache-ant-jars.patch -Patch2: apache-ant-gnu-classpath.patch +Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 +Source2: apache-ant-%{major_version}.ant.conf +Source1000: pre_checkin.sh + +Patch1: apache-ant-bz163689.patch Patch3: apache-ant-no-test-jar.patch -# SUSE patches -Patch103: apache-ant-source-level.patch -BuildRequires: jpackage-utils >= 1.7.5 +Patch4: apache-ant-class-path-in-manifest.patch + +%if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel +%else +BuildRequires: java-devel >= 1.5.0 +%endif +BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: antlr-bootstrap -#!BuildIgnore: antlr antlr-java BuildRequires: unzip BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap -#BuildRequires: jaxp_transform_impl BuildRequires: xalan-j2 -BuildRequires: ant +BuildRequires: ant = %{version} BuildRequires: junit BuildRequires: xml-commons-apis BuildRequires: xerces-j2 +#!BuildIgnore: antlr %endif %if %bootstrap Requires: xerces-j2 >= 2.7.1-2 @@ -92,6 +92,12 @@ Requires: xml-commons-apis Requires: xml-commons-resolver Requires: jpackage-utils >= 1.7.5 Requires: java-devel >= 1.5.0 +Obsoletes: apache-ant < %{version} +Provides: apache-ant = %{version} +Obsoletes: ant-nodeps < %{version} +Provides: ant-nodeps = %{version} +Obsoletes: ant-trax < %{version} +Provides: ant-trax = %{version} %else # ant-antlr requires Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) @@ -100,8 +106,6 @@ Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: apache-ant -Provides: apache-ant %description Apache Ant is a Java-based build tool. In theory, it is kind of like @@ -154,17 +158,6 @@ This package contains optional jmf tasks for Apache Ant. -%package -n ant-nodeps -License: Apache Software License .. -Summary: Optional tasks for ant -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-nodeps = %{version}-%{release} - -%description -n ant-nodeps -Apache Ant is a Java-based build tool. - -This package contains optional tasks for Apache Ant. @@ -182,22 +175,6 @@ This package contains optional swing tasks for Apache Ant. -%package -n ant-trax -License: Apache Software License .. -Summary: Optional trax tasks for ant -Group: Development/Tools/Building -Requires: ant = %{version} -Requires: jaxp_transform_impl -Provides: ant-trax = %{version}-%{release} -# The ant-xalan jar has been merged into the ant-trax one -Obsoletes: ant-xalan2 < %{version}-%{release} -Provides: ant-xalan2 = %{version}-%{release} - -%description -n ant-trax -Apache Ant is a Java-based build tool. - -This package contains optional trax tasks for Apache Ant. - %package -n ant-scripts @@ -284,6 +261,7 @@ This package contains optional commons net tasks for Apache Ant. +# Disable because we don't ship the dependencies %if 0 %package -n ant-jai @@ -307,9 +285,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bcel BuildRequires: bcel -Provides: ant-apache-bcel = %{version}-%{release} -Provides: ant-jakarta-bcel = %{version}-%{release} -Obsoletes: ant-jakarta-bcel < %{version}-%{release} +Provides: ant-apache-bcel = %{version} +Provides: ant-jakarta-bcel = %{version} +Obsoletes: ant-jakarta-bcel < %{version} %description -n ant-apache-bcel Apache Ant is a Java-based build tool. @@ -325,9 +303,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: log4j BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version}-%{release} -Provides: ant-jakarta-log4j = %{version}-%{release} -Obsoletes: ant-jakarta-log4j < %{version}-%{release} +Provides: ant-apache-log4j = %{version} +Provides: ant-jakarta-log4j = %{version} +Obsoletes: ant-jakarta-log4j < %{version} %description -n ant-apache-log4j Apache Ant is a Java-based build tool. @@ -343,9 +321,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: oro BuildRequires: oro -Provides: ant-apache-oro = %{version}-%{release} -Provides: ant-jakarta-oro = %{version}-%{release} -Obsoletes: ant-jakarta-oro < %{version}-%{release} +Provides: ant-apache-oro = %{version} +Provides: ant-jakarta-oro = %{version} +Obsoletes: ant-jakarta-oro < %{version} %description -n ant-apache-oro Apache Ant is a Java-based build tool. @@ -361,27 +339,35 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp BuildRequires: regexp -Provides: ant-apache-regexp = %{version}-%{release} -Provides: ant-jakarta-regexp = %{version}-%{release} -Obsoletes: ant-jakarta-regexp < %{version}-%{release} +Provides: ant-apache-regexp = %{version} +Provides: ant-jakarta-regexp = %{version} +Obsoletes: ant-jakarta-regexp < %{version} %description -n ant-apache-regexp Apache Ant is a Java-based build tool. This package contains optional apache regexp tasks for Apache Ant. +%package -n ant-apache-xalan2 +Summary: Optional apache xalan2 tasks for ant +Group: Development/Tools/Building +BuildRequires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) +Requires: regexp +Provides: ant-apache-xalan2 = %{version} + +%description -n ant-apache-xalan2 +Optional apache xalan2 tasks for %{name}. %package -n ant-javamail License: Other uncritical OpenSource License ; Common Development and Distribution License Summary: Optional javamail tasks for ant Group: Development/Tools/Building +BuildRequires: javamail >= 1.2-5jpp Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: javamail >= 1.2-5jpp -Requires: jaf >= 1.0.1-5jpp -BuildRequires: javamail >= 1.2-5jpp -BuildRequires: jaf >= 1.0.1-5jpp -Provides: ant-javamail = %{version}-%{release} +Provides: ant-javamail = %{version} %description -n ant-javamail Apache Ant is a Java-based build tool. @@ -397,7 +383,7 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jdepend BuildRequires: jdepend -Provides: ant-jdepend = %{version}-%{release} +Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. @@ -413,7 +399,7 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jsch BuildRequires: jsch -Provides: ant-jsch = %{version}-%{release} +Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. @@ -428,13 +414,23 @@ Summary: Optional junit tasks for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit -Provides: ant-junit = %{version}-%{release} +Provides: ant-junit = %{version} %description -n ant-junit Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. +%package -n ant-testutil +Summary: Test utility classes for ant +Group: Development/Tools/Building +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) +Requires: junit +Provides: ant-testutil = %{version} + +%description -n ant-testutil +Test utility tasks for %{name}. + %package -n ant-manual @@ -462,204 +458,179 @@ This package contains the javadoc documentation for Apache Ant. %endif -# % package -n ant-scripts -# License: The Apache Software License -# Summary: Additional scripts for ant -# Group: Development/Tools/Building -# #AutoReqProv: no -# Requires: ant = %{version} -# Requires: /usr/bin/perl -# Requires: /usr/bin/python -# % description -n ant-scripts -# Apache Ant is a Java-based build tool. -# -# This package contains additional perl and python scripts for Apache -# Ant. %prep -%setup -q -n apache-ant-%{version} +%setup -q -n apache-ant-%{cvs_version} +#Fixup version +find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// +#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 + # Fix some places where copies of classes are included in the wrong jarfiles -%patch0 -p1 + +# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689). +%ifarch ppc64 s390x +%patch1 -p1 -b .sav1 +%endif + # Update ant to work with recent versions of GNU Classpath -%patch2 -p1 # When bootstrapping, we don't have junit %patch3 -p1 -%patch103 -b .target5 + +# Fix class-path-in-manifest rpmlint warning +%patch4 + # clean jar files -find . -name "*.jar" | %{_bindir}/xargs -t rm +%{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t rm + +#install jars +%if ! %bootstrap +build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver +%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__ > %{name}-perl.prov +#!/bin/sh +/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$' +__EOF__ +%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov +chmod +x %{__perl_provides} + + +# Requires: exclude bogus perl(the) +cat <<__EOF__ > %{name}-perl.req +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$' +__EOF__ +%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req +chmod +x %{__perl_requires} + # ----------------------------------------------------------------------------- %build export OPT_JAR_LIST=: %if ! %bootstrap -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr-bootstrap bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver) -%{ant} jars +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) +%{ant} -Dbuild.sysclasspath=first distribution %{ant} javadocs %else export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar export BOOTJAVAC_OPTS="-C -Wno-deprecated" -sh ./build.sh --noconfig jars +sh -x ./build.sh --noconfig jars %endif -# ----------------------------------------------------------------------------- %install # ANT_HOME and subdirs -mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc} +mkdir -p %{buildroot}%{ant_home}/{lib,etc} # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{real_name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_javadir}/ant +install -d -m 755 %{buildroot}%{_datadir}/maven2/poms + +for jar in build/lib/*.jar +do + jarname=$(basename $jar .jar) + pomname="JPP.%{name}-${jarname}.pom" + + #Determine where to put it + case $jarname in +#These go into %%{_javadir}, pom files have different names + ant | ant-bootstrap | ant-launcher) %if %bootstrap -install -m 644 build/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-%{version}.jar -install -m 644 build/lib/ant-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-bootstrap-%{version}.jar -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}.pom -%add_to_maven_depmap org.apache.ant %{real_name} %{version} JPP %{real_name} -install -m 644 build/lib/ant-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-launcher-%{version}.jar -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}-launcher.pom -%add_to_maven_depmap org.apache.ant %{real_name}-launcher %{version} JPP %{real_name}-launcher -install -m 644 build/lib/ant-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jmf-%{version}.jar -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jmf.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jmf %{version} JPP/%{real_name} %{real_name}-jmf -install -m 644 build/lib/ant-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-nodeps-%{version}.jar -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-nodeps.pom -%add_to_maven_depmap org.apache.ant %{real_name}-nodeps %{version} JPP/%{real_name} %{real_name}-nodeps -install -m 644 build/lib/ant-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-swing-%{version}.jar -install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-swing.pom -%add_to_maven_depmap org.apache.ant %{real_name}-swing %{version} JPP/%{real_name} %{real_name}-swing -install -m 644 build/lib/ant-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-trax-%{version}.jar -install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-trax.pom -%add_to_maven_depmap org.apache.ant %{real_name}-trax %{version} JPP/%{real_name} %{real_name}-trax -install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}-parent.pom -%add_to_maven_depmap org.apache.ant %{real_name}-parent %{version} JPP %{real_name}-parent -%endif #if %bootstrap -# optional jars -%if ! %bootstrap -#install -m 644 build/lib/ant-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-icontract-%{version}.jar -#install -m 644 build/lib/ant-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-netrexx-%{version}.jar -#install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-netrexx.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-netrexx %{version} JPP/%{real_name} %{real_name}-netrexx -#install -m 644 build/lib/ant-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-starteam-%{version}.jar -#install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-starteam.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-starteam %{version} JPP/%{real_name} %{real_name}-starteam -#install -m 644 build/lib/ant-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-stylebook-%{version}.jar -#install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-stylebook.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-stylebook %{version} JPP/%{real_name} %{real_name}-stylebook -#install -m 644 build/lib/ant-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-vaj-%{version}.jar -#install -m 644 build/lib/ant-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-weblogic-%{version}.jar -#install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-weblogic.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-weblogic %{version} JPP/%{real_name} %{real_name}-weblogic -#install -m 644 build/lib/ant-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-xalan1-%{version}.jar -#install -m 644 build/lib/ant-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-xslp-%{version}.jar -install -m 644 build/lib/ant-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-antlr-%{version}.jar -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-antlr.pom -%add_to_maven_depmap org.apache.ant %{real_name}-antlr %{version} JPP/%{real_name} %{real_name}-antlr -install -m 644 build/lib/ant-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-bsf-%{version}.jar -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-bsf.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-bsf %{version} JPP/%{real_name} %{real_name}-apache-bsf -install -m 644 build/lib/ant-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-resolver-%{version}.jar -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-resolver.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-resolver %{version} JPP/%{real_name} %{real_name}-apache-resolver -install -m 644 build/lib/ant-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-commons-logging-%{version}.jar -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-commons-logging.pom -%add_to_maven_depmap org.apache.ant %{real_name}-commons-logging %{version} JPP/%{real_name} %{real_name}-commons-logging -install -m 644 build/lib/ant-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-commons-net-%{version}.jar -install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-commons-net.pom -%add_to_maven_depmap org.apache.ant %{real_name}-commons-net %{version} JPP/%{real_name} %{real_name}-commons-net -#install -m 644 build/lib/ant-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jai-%{version}.jar -#install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jai.pom -#%add_to_maven_depmap org.apache.ant %{real_name}-jai %{version} JPP/%{real_name} %{real_name}-jai -install -m 644 build/lib/ant-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-bcel-%{version}.jar -install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-bcel.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-bcel %{version} JPP/%{real_name} %{real_name}-apache-bcel -install -m 644 build/lib/ant-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-log4j-%{version}.jar -install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-log4j.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-log4j %{version} JPP/%{real_name} %{real_name}-apache-log4j -install -m 644 build/lib/ant-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-oro-%{version}.jar -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-oro.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-oro %{version} JPP/%{real_name} %{real_name}-apache-oro -install -m 644 build/lib/ant-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-regexp-%{version}.jar -install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-regexp.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-regexp %{version} JPP/%{real_name} %{real_name}-apache-regexp -ln -sf %{real_name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-bcel.jar -ln -sf %{real_name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-log4j.jar -ln -sf %{real_name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-oro.jar -ln -sf %{real_name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-regexp.jar -install -m 644 build/lib/ant-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-javamail-%{version}.jar -install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-javamail.pom -%add_to_maven_depmap org.apache.ant %{real_name}-javamail %{version} JPP/%{real_name} %{real_name}-javamail -install -m 644 build/lib/ant-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jdepend-%{version}.jar -install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jdepend.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jdepend %{version} JPP/%{real_name} %{real_name}-jdepend -install -m 644 build/lib/ant-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jsch-%{version}.jar -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jsch.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jsch %{version} JPP/%{real_name} %{real_name}-jsch -install -m 644 build/lib/ant-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-junit-%{version}.jar -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-junit.pom -%add_to_maven_depmap org.apache.ant %{real_name}-junit %{version} JPP/%{real_name} %{real_name}-junit + destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" +%else + continue %endif -# jar aliases + ;; +#Bootstracp builds an incomplete ant-junit, don't ship it %if %bootstrap -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *.jar; do ln -sf %{_javadir}/${jar} $RPM_BUILD_ROOT/%{ant_home}/lib/${jar}; done) + ant-junit) continue;; %endif -(cd $RPM_BUILD_ROOT%{_javadir}/%{real_name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir}/%{real_name} && for jar in *.jar; do ln -sf %{_javadir}/%{real_name}/${jar} $RPM_BUILD_ROOT/%{ant_home}/lib/${jar}; done) +#These go into %%{_javadir}/ant + *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; + esac + + #instal jar + install -m 644 ${jar} ${destdir}/${jarname}.jar + # jar aliases + ln -sf ../../java${destname}/${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar + + #bootstrap does not have a pom + [ $jarname == ant-bootstrap ] && continue + + #install pom + install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}%{_datadir}/maven2/poms/${pomname} + %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} +done + +%if %bootstrap +# add backward compatibility for nodeps jar that is now part of +# main jar +%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant + +#ant-parent pom +install -m 644 src/etc/poms/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-ant-parent.pom +%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent + # scripts: remove dos and os/2 scripts rm -f src/script/*.bat rm -f src/script/*.cmd -%if %bootstrap + # XSLs -cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc -rm -f $RPM_BUILD_ROOT%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl +cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc +rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc %endif + %if %bootstrap # install everything else -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -p src/script/* $RPM_BUILD_ROOT%{_bindir} -#% else -# cp -p src/script/ant{,Run} $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} +cp -p src/script/* %{buildroot}%{_bindir}/ %endif -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d %if %bootstrap # default ant.conf -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.conf +mkdir -p %{buildroot}%{_sysconfdir} +cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/ant.conf + # OPT_JAR_LIST fragments -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d -echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jmf -echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/nodeps -echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/swing -echo "jaxp_transform_impl ant/ant-trax xalan-j2-serializer" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/trax -%endif #if bootstrap -%if ! %bootstrap -echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/antlr -echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-bsf -echo "xml-commons-resolver12 ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-resolver -echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/commons-logging -echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/commons-net -#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jai -echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-log4j -echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-oro -echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-regexp -echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/javamail -echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jdepend -echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jsch -echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/junit +mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d +echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf +echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing +%else +echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr +echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf +echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver +echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net +#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai +echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel +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 "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 +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 "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit +echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif %if ! %bootstrap # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} +mkdir -p %{buildroot}%{_javadocdir}/ant +cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant %endif # fix link between manual and javadoc -(cd docs/manual; ln -sf %{_javadocdir}/%{real_name}-%{version} api) +(cd docs/manual; ln -sf %{_javadocdir}/%{name} api) %if %bootstrap -find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \ +find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ -a ! -name coverage-frames.xsl \ @@ -671,7 +642,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \ %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # ----------------------------------------------------------------------------- %post @@ -679,150 +650,112 @@ rm -rf $RPM_BUILD_ROOT %postun %update_maven_depmap -%if %bootstrap +%if %bootstrap %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW -%config(noreplace) %{_sysconfdir}/%{real_name}.conf +%config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{real_name}.jar -%{_javadir}/%{real_name}-%{version}.jar -%{_javadir}/%{real_name}-launcher.jar -%{_javadir}/%{real_name}-launcher-%{version}.jar -%{_javadir}/%{real_name}-bootstrap.jar -%{_javadir}/%{real_name}-bootstrap-%{version}.jar -%dir %{_javadir}/%{real_name} +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-launcher.jar +%{_javadir}/%{name}-bootstrap.jar +%dir %{_javadir}/%{name} %dir %{ant_home} %dir %{ant_home}/etc %{ant_home}/etc/ant-update.xsl %{ant_home}/etc/changelog.xsl +%{ant_home}/etc/coverage-frames.xsl +%{ant_home}/etc/mmetrics-frames.xsl %{ant_home}/etc/log.xsl %{ant_home}/etc/tagdiff.xsl %{ant_home}/etc/junit-frames-xalan1.xsl -%if ! %bootstrap -%{ant_home}/etc/common2master.xsl -%endif +# % {ant_home}/etc/common2master.xsl +# % {ant_home}/etc/printFailingTests.xsl %dir %{ant_home}/lib +%dir %{_sysconfdir}/%{name}.d %{ant_home}/lib/ant.jar -%{ant_home}/lib/ant-%{version}.jar %{ant_home}/lib/ant-bootstrap.jar -%{ant_home}/lib/ant-bootstrap-%{version}.jar %{ant_home}/lib/ant-launcher.jar -%{ant_home}/lib/ant-launcher-%{version}.jar -%dir %{_sysconfdir}/%{real_name}.d +%dir %{_sysconfdir}/ant.d # % {_datadir}/maven2/poms/* %{_datadir}/maven2/poms/JPP-ant-launcher.pom %{_datadir}/maven2/poms/JPP-ant-parent.pom %{_datadir}/maven2/poms/JPP-ant.pom -%config %{_mavendepmapfragdir}/* -%dir %{_sysconfdir}/maven/fragments +%config(noreplace) %{_mavendepmapfragdir}/* +%config(noreplace) %dir %{_sysconfdir}/maven/fragments %dir %{_datadir}/maven2 %dir %{_datadir}/maven2/poms + %else # ant-antlr filelist - %files %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-antlr.jar -%{_javadir}/%{real_name}/%{real_name}-antlr-%{version}.jar -%{ant_home}/lib/%{real_name}-antlr.jar -%{ant_home}/lib/%{real_name}-antlr-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/antlr +%{_javadir}/ant/ant-antlr.jar +%{ant_home}/lib/ant-antlr.jar +%config(noreplace) %{_sysconfdir}/ant.d/antlr %{_datadir}/maven2/poms/JPP.ant-ant-antlr.pom %config %{_mavendepmapfragdir}/ant-antlr %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %endif + ### Basic ant subpackages %if %bootstrap - %files -n ant-jmf %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jmf.jar -%{_javadir}/%{real_name}/%{real_name}-jmf-%{version}.jar -%{ant_home}/lib/%{real_name}-jmf.jar -%{ant_home}/lib/%{real_name}-jmf-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jmf +%{_javadir}/ant/ant-jmf.jar +%{ant_home}/lib/ant-jmf.jar +%config(noreplace) %{_sysconfdir}/ant.d/jmf %{_datadir}/maven2/poms/JPP.ant-ant-jmf.pom -%files -n ant-nodeps -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-nodeps.jar -%{_javadir}/%{real_name}/%{real_name}-nodeps-%{version}.jar -%{ant_home}/lib/%{real_name}-nodeps.jar -%{ant_home}/lib/%{real_name}-nodeps-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/nodeps -%{_datadir}/maven2/poms/JPP.ant-ant-nodeps.pom - %files -n ant-swing %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-swing.jar -%{_javadir}/%{real_name}/%{real_name}-swing-%{version}.jar -%{ant_home}/lib/%{real_name}-swing.jar -%{ant_home}/lib/%{real_name}-swing-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/swing +%{_javadir}/ant/ant-swing.jar +%{ant_home}/lib/ant-swing.jar +%config(noreplace) %{_sysconfdir}/ant.d/swing %{_datadir}/maven2/poms/JPP.ant-ant-swing.pom -%files -n ant-trax -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-trax.jar -%{_javadir}/%{real_name}/%{real_name}-trax-%{version}.jar -%{ant_home}/lib/%{real_name}-trax.jar -%{ant_home}/lib/%{real_name}-trax-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/trax -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/coverage-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-trax.pom - %files -n ant-scripts %defattr(0755,root,root,0755) %{_bindir}/*.pl %{_bindir}/*.py* %endif #if bootstrap -%if ! %bootstrap +%if ! %bootstrap %files -n ant-apache-bsf %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-bsf.jar -%{_javadir}/%{real_name}/%{real_name}-apache-bsf-%{version}.jar -%{ant_home}/lib/%{real_name}-apache-bsf.jar -%{ant_home}/lib/%{real_name}-apache-bsf-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-bsf +%{_javadir}/ant/ant-apache-bsf.jar +%{ant_home}/lib/ant-apache-bsf.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf %{_datadir}/maven2/poms/JPP.ant-ant-apache-bsf.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-resolver %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-resolver.jar -%{_javadir}/%{real_name}/%{real_name}-apache-resolver-%{version}.jar -%{ant_home}/lib/%{real_name}-apache-resolver.jar -%{ant_home}/lib/%{real_name}-apache-resolver-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-resolver +%{_javadir}/ant/ant-apache-resolver.jar +%{ant_home}/lib/ant-apache-resolver.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver %{_datadir}/maven2/poms/JPP.ant-ant-apache-resolver.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-commons-logging %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-commons-logging.jar -%{_javadir}/%{real_name}/%{real_name}-commons-logging-%{version}.jar -%{ant_home}/lib/%{real_name}-commons-logging.jar -%{ant_home}/lib/%{real_name}-commons-logging-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/commons-logging +%{_javadir}/ant/ant-commons-logging.jar +%{ant_home}/lib/ant-commons-logging.jar +%config(noreplace) %{_sysconfdir}/ant.d/commons-logging %{_datadir}/maven2/poms/JPP.ant-ant-commons-logging.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-commons-net %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-commons-net.jar -%{_javadir}/%{real_name}/%{real_name}-commons-net-%{version}.jar -%{ant_home}/lib/%{real_name}-commons-net.jar -%{ant_home}/lib/%{real_name}-commons-net-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/commons-net +%{_javadir}/ant/ant-commons-net.jar +%{ant_home}/lib/ant-commons-net.jar +%config(noreplace) %{_sysconfdir}/ant.d/commons-net %{_datadir}/maven2/poms/JPP.ant-ant-commons-net.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -831,84 +764,71 @@ rm -rf $RPM_BUILD_ROOT %files -n ant-jai %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jai.jar -%{_javadir}/%{real_name}/%{real_name}-jai-%{version}.jar -%{ant_home}/lib/%{real_name}-jai.jar -%{ant_home}/lib/%{real_name}-jai-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jai +%{_javadir}/ant/ant-jai.jar +%{ant_home}/lib/ant-jai.jar +%config(noreplace) %{_sysconfdir}/ant.d/jai %endif %files -n ant-apache-bcel %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-bcel.jar -%{_javadir}/%{real_name}/%{real_name}-apache-bcel-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-bcel.jar -%{ant_home}/lib/%{real_name}-apache-bcel.jar -%{ant_home}/lib/%{real_name}-apache-bcel-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-bcel.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-bcel +%{_javadir}/ant/ant-apache-bcel.jar +%{_javadir}/ant/ant-jakarta-bcel.jar +%{ant_home}/lib/ant-apache-bcel.jar +%{ant_home}/lib/ant-jakarta-bcel.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel %{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-log4j %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-log4j.jar -%{_javadir}/%{real_name}/%{real_name}-apache-log4j-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-log4j.jar -%{ant_home}/lib/%{real_name}-apache-log4j.jar -%{ant_home}/lib/%{real_name}-apache-log4j-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-log4j.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-log4j +%{_javadir}/ant/ant-apache-log4j.jar +%{_javadir}/ant/ant-jakarta-log4j.jar +%{ant_home}/lib/ant-apache-log4j.jar +%{ant_home}/lib/ant-jakarta-log4j.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j %{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-oro %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-oro.jar -%{_javadir}/%{real_name}/%{real_name}-apache-oro-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-oro.jar -%{ant_home}/lib/%{real_name}-apache-oro.jar -%{ant_home}/lib/%{real_name}-apache-oro-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-oro.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-oro -%{ant_home}/etc/maudit-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom +%{_javadir}/ant/ant-apache-oro.jar +%{_javadir}/ant/ant-jakarta-oro.jar +%{ant_home}/lib/ant-apache-oro.jar +%{ant_home}/lib/ant-jakarta-oro.jar %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-regexp -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-regexp.jar -%{_javadir}/%{real_name}/%{real_name}-apache-regexp-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-regexp.jar -%{ant_home}/lib/%{real_name}-apache-regexp.jar -%{ant_home}/lib/%{real_name}-apache-regexp-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-regexp.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-regexp +%defattr(-,root,root,-) +%{_javadir}/ant/ant-apache-regexp.jar +%{ant_home}/lib/ant-apache-regexp.jar +%config(noreplace) %{_sysconfdir}/ant/apache-regexp %{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms +%files -n ant-apache-xalan2 +%defattr(-,root,root,-) +%{_javadir}/ant/ant-apache-xalan2.jar +%{ant_home}/lib/ant-apache-xalan2.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 + %files -n ant-javamail %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-javamail.jar -%{_javadir}/%{real_name}/%{real_name}-javamail-%{version}.jar -%{ant_home}/lib/%{real_name}-javamail.jar -%{ant_home}/lib/%{real_name}-javamail-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/javamail +%{_javadir}/ant/ant-javamail.jar +%{ant_home}/lib/ant-javamail.jar +%config(noreplace) %{_sysconfdir}/ant.d/javamail %{_datadir}/maven2/poms/JPP.ant-ant-javamail.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-jdepend %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jdepend.jar -%{_javadir}/%{real_name}/%{real_name}-jdepend-%{version}.jar -%{ant_home}/lib/%{real_name}-jdepend.jar -%{ant_home}/lib/%{real_name}-jdepend-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jdepend +%{_javadir}/ant/ant-jdepend.jar +%{ant_home}/lib/ant-jdepend.jar +%config(noreplace) %{_sysconfdir}/ant.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl %{_datadir}/maven2/poms/JPP.ant-ant-jdepend.pom @@ -917,35 +837,37 @@ rm -rf $RPM_BUILD_ROOT %files -n ant-jsch %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jsch.jar -%{_javadir}/%{real_name}/%{real_name}-jsch-%{version}.jar -%{ant_home}/lib/%{real_name}-jsch.jar -%{ant_home}/lib/%{real_name}-jsch-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jsch +%{_javadir}/ant/ant-jsch.jar +%{ant_home}/lib/ant-jsch.jar +%config(noreplace) %{_sysconfdir}/ant.d/jsch %{_datadir}/maven2/poms/JPP.ant-ant-jsch.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-junit %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-junit.jar -%{_javadir}/%{real_name}/%{real_name}-junit-%{version}.jar -%{ant_home}/lib/%{real_name}-junit.jar -%{ant_home}/lib/%{real_name}-junit-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/junit +%{_javadir}/ant/ant-junit.jar +%{ant_home}/lib/ant-junit.jar +%config(noreplace) %{_sysconfdir}/ant.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_datadir}/maven2/poms/JPP.ant-ant-junit.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms +%files -n ant-testutil +%defattr(-,root,root,-) +%{_javadir}/ant/ant-testutil.jar +%{ant_home}/lib/ant-testutil.jar +%config(noreplace) %{_sysconfdir}/ant.d/testutil + %files -n ant-manual %defattr(0644,root,root,0755) %doc docs/* %files -n ant-javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{real_name}-%{version} +%{_javadocdir}/ant-%{version} %endif %changelog diff --git a/ant-apache-bcel-1.7.1.pom b/ant-apache-bcel-1.7.1.pom deleted file mode 100644 index 8a92d12..0000000 --- a/ant-apache-bcel-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-bcel - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - bcel - bcel - 5.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/tfilters/util/JavaClassHelper* - org/apache/tools/ant/tutil/depend/bcel/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-apache-bsf-1.7.1.pom b/ant-apache-bsf-1.7.1.pom deleted file mode 100644 index b57d34a..0000000 --- a/ant-apache-bsf-1.7.1.pom +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-bsf - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - bsf - bsf - 2.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-apache-log4j-1.7.1.pom deleted file mode 100644 index fa1e044..0000000 --- a/ant-apache-log4j-1.7.1.pom +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-log4j - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - log4j - log4j - 1.2.13 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-apache-oro-1.7.1.pom deleted file mode 100644 index 5d9b31d..0000000 --- a/ant-apache-oro-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-oro - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - oro - oro - 2.0.8 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/util/regexp/JakartaOro* - 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.7.1.pom b/ant-apache-regexp-1.7.1.pom deleted file mode 100644 index 1b779fb..0000000 --- a/ant-apache-regexp-1.7.1.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-regexp - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - regexp - regexp - 1.3 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-apache-resolver-1.7.1.pom deleted file mode 100644 index 55dbf9f..0000000 --- a/ant-apache-resolver-1.7.1.pom +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-apache-resolver - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - xml-resolver - xml-resolver - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-commons-logging-1.7.1.pom deleted file mode 100644 index 47ab8b9..0000000 --- a/ant-commons-logging-1.7.1.pom +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-commons-logging - 1.7.1 - Ant Listener based on commons-logging - - - org.apache.ant - ant - 1.7.1 - compile - - - commons-logging - commons-logging-api - 1.0.4 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-commons-net-1.7.1.pom deleted file mode 100644 index c7b3a9e..0000000 --- a/ant-commons-net-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-commons-net - 1.7.1 - ftp, rexec and telnet tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - commons-net - commons-net - 1.4.0 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/net/TelnetTask* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-javamail-1.7.1.pom b/ant-javamail-1.7.1.pom deleted file mode 100644 index 4b7a1fb..0000000 --- a/ant-javamail-1.7.1.pom +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-javamail - 1.7.1 - 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.7.1 - compile - - - javax.mail - mail - 1.4 - compile - - - javax.activation - activation - 1.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-jdepend-1.7.1.pom deleted file mode 100644 index 09f2215..0000000 --- a/ant-jdepend-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jdepend - 1.7.1 - 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.7.1 - compile - - - jdepend - jdepend - 2.7 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-jmf-1.7.1.pom deleted file mode 100644 index 4b9807e..0000000 --- a/ant-jmf-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jmf - 1.7.1 - 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.7.1 - compile - - - javax.media - jmf - 2.1.1e - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-jsch-1.7.1.pom deleted file mode 100644 index 3d84717..0000000 --- a/ant-jsch-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-jsch - 1.7.1 - contains the sshexec and scp tasks - jsch 0.1.29 might not be available from maven - - - org.apache.ant - ant - 1.7.1 - compile - - - com.jcraft - jsch - 0.1.29 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-junit-1.7.1.pom deleted file mode 100644 index ab20a85..0000000 --- a/ant-junit-1.7.1.pom +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-junit - 1.7.1 - contains the junit and junirreport tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - junit - junit - 3.8.2 - compile - - - - - - maven-antrun-plugin - - - create-timestamp-file - generate-resources - - run - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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.7.1.pom b/ant-launcher-1.7.1.pom deleted file mode 100644 index 2795e7c..0000000 --- a/ant-launcher-1.7.1.pom +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-launcher - 1.7.1 - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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-netrexx-1.7.1.pom b/ant-netrexx-1.7.1.pom deleted file mode 100644 index ebb9ab7..0000000 --- a/ant-netrexx-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-netrexx - 1.7.1 - NetRexxC task - dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html - - - org.apache.ant - ant - 1.7.1 - compile - - - com.ibm.netrexx - netrexx - 2.0.5 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/NetRexxC* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-nodeps-1.7.1.pom b/ant-nodeps-1.7.1.pom deleted file mode 100644 index 2f5d86e..0000000 --- a/ant-nodeps-1.7.1.pom +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-nodeps - 1.7.1 - contains all the optional tasks and types which do not have particular dependencies - - - org.apache.ant - ant - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - compile - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant/taskdefs/optional/** - org/apache/tools/ant/types/optional/** - org/apache/tools/ant/util/depend/* - org/apache/tools/ant/util/optional/** - org/apache/tools/ant/util/java15/** - org/apache/tools/ant/util/regexp/Jdk14Regexp* - - - org/apache/tools/ant/taskdefs/optional/TraXLiaison* - org/apache/tools/ant/taskdefs/optional/junit/** - org/apache/tools/ant/taskdefs/optional/perforce/** - org/apache/tools/ant/taskdefs/optional/Script* - org/apache/tools/ant/taskdefs/optional/script/** - org/apache/tools/ant/util/optional/Script* - org/apache/tools/ant/types/optional/*Script* - org/apache/tools/ant/taskdefs/optional/StyleBook* - org/apache/tools/ant/taskdefs/optional/NetRexxC* - org/apache/tools/ant/taskdefs/optional/ejb/Ejbc* - org/apache/tools/ant/taskdefs/optional/ejb/DDCreator* - org/apache/tools/ant/taskdefs/optional/ejb/WLRun* - org/apache/tools/ant/taskdefs/optional/ejb/WLStop* - org/apache/tools/ant/taskdefs/optional/net/Telnet* - org/apache/tools/ant/taskdefs/optional/net/FTP* - org/apache/tools/ant/taskdefs/optional/net/RExec* - org/apache/tools/ant/taskdefs/optional/scm/AntStarTeam* - org/apache/tools/ant/taskdefs/optional/starteam/* - org/apache/tools/ant/taskdefs/optional/ANTLR* - org/apache/tools/ant/taskdefs/optional/sound/* - org/apache/tools/ant/taskdefs/optional/image/* - org/apache/tools/ant/types/optional/image/* - org/apache/tools/ant/taskdefs/optional/jdepend/* - org/apache/tools/ant/taskdefs/optional/splash/* - org/apache/tools/ant/taskdefs/optional/ssh/* - - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/ant-nodeps/classes - ../../../../target/ant-nodeps/testcases - ../../../../target/ant-nodeps - - diff --git a/ant-parent-1.7.1.pom b/ant-parent-1.7.1.pom deleted file mode 100644 index d212645..0000000 --- a/ant-parent-1.7.1.pom +++ /dev/null @@ -1,111 +0,0 @@ - - - - - 4.0.0 - org.apache.ant - ant-parent - 1.7.1 - pom - master POM - Apache Ant - http://ant.apache.org/ - 2000 - - Apache Software Foundation - - - - - 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/jant/core/trunk - http://svn.apache.org/repos/asf/ant/core/trunk - - - - 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-commons-logging - ant-commons-net - ant-jai - ant-javamail - ant-jdepend - ant-jmf - ant-jsch - ant-junit - ant-launcher - ant-netrexx - ant-nodeps - ant-starteam - ant-stylebook - ant-swing - ant-testutil - ant-trax - ant-weblogic - - - - junit - junit - 3.8.2 - test - - - - ../../../src/main - ../../../src/testcases - ../../../target/classes - ../../../target/testcases - - diff --git a/ant-starteam-1.7.1.pom b/ant-starteam-1.7.1.pom deleted file mode 100644 index 35267a0..0000000 --- a/ant-starteam-1.7.1.pom +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-starteam - Starteam SDK tasks - - - org.apache.ant - ant - 1.7.1 - compile - - - com.starteam - starteam-sdk - 5.2 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/scm/AntStarTeam* - org/apache/tools/ant//taskdefs/optional/scm/starteam/* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-stylebook-1.7.1.pom b/ant-stylebook-1.7.1.pom deleted file mode 100644 index f419d6b..0000000 --- a/ant-stylebook-1.7.1.pom +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-stylebook - 1.7.1 - executes the Apache Stylebook document generator. Deprecated since Ant 1.7 - - - org.apache.ant - ant - 1.7.1 - compile - - - stylebook - stylebook - 1.0-b2 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/StyleBook* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - - diff --git a/ant-swing-1.7.1.pom b/ant-swing-1.7.1.pom deleted file mode 100644 index 57b8e0f..0000000 --- a/ant-swing-1.7.1.pom +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-swing - 1.7.1 - a listener and a splash task based on Swing - - - org.apache.ant - ant - 1.7.1 - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - 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-trax-1.7.1.pom b/ant-trax-1.7.1.pom deleted file mode 100644 index b7b1f6e..0000000 --- a/ant-trax-1.7.1.pom +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-trax - 1.7.1 - contains particularly one class necessary for the execution of the xslt task - - - org.apache.ant - ant - 1.7.1 - compile - - - - xerces - xercesImpl - 2.9.0 - true - runtime - - - - xml-apis - xml-apis - 1.3.04 - true - compile - - - - xalan - xalan - 2.7.0 - true - runtime - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/TraXLiaison* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant-weblogic-1.7.1.pom b/ant-weblogic-1.7.1.pom deleted file mode 100644 index a32f58c..0000000 --- a/ant-weblogic-1.7.1.pom +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - org.apache.ant - ant-parent - ../pom.xml - 1.7.1 - - 4.0.0 - org.apache.ant - ant-weblogic - 1.7.1 - - - org.apache.ant - ant - 1.7.1 - compile - - - com.bea - weblogicclasses - 5.1 - provided - - - com.bea - weblogic - 8.1.3.0 - provided - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.2 - 1.2 - - org/apache/tools/ant//taskdefs/optional/ejb/Ejbc* - org/apache/tools/ant//taskdefs/optional/ejb/DDCreator* - org/apache/tools/ant//taskdefs/optional/ejb/WLRun* - org/apache/tools/ant//taskdefs/optional/ejb/WLStop* - - - - - ../../../../src/main - ../../../../src/testcases - ../../../../target/${project.artifactId}/classes - ../../../../target/${project.artifactId}/testcases - ../../../../target/${project.artifactId} - - diff --git a/ant.changes b/ant.changes index c7e7c0e..1e62696 100644 --- a/ant.changes +++ b/ant.changes @@ -1,12 +1,48 @@ ------------------------------------------------------------------- -Thu Nov 4 09:43:24 UTC 2010 - mvyskocil@suse.cz +Wed Mar 9 08:56:33 UTC 2011 - mvyskocil@suse.cz -- Fix the summary - -------------------------------------------------------------------- -Tue Aug 31 12:08:16 UTC 2010 - mvyskocil@suse.cz - -- Build with antlr-bootstrap, ignore antlr(-java) to reduce build cycles +- Update to ant 1.8.2 + * performance improvements in directory scanning + * XSLT task honors classpath again (bugrep 49271) + * distinction between core tasks and optional tasks is abolished + * new task augment allows to add attributes or nested elements to previously + defined references + * Lexically scoped local properties, i.e. properties that are only defined + inside a target, sequential block or similar environment. This is very + useful inside of s where a macro can now define a temporary + property that will disappear once the task has finished. + * can now import from any file- or URL-providing resource - this + includes . This means can read build file snippets + from JARs or fixed server URLs. There are several other improvements in the + area of import. + * Various improvements to the directory scanning code that help with symbolic + link cycles (as can be found on MacOS X Java installations for example) and + improve scanning performance. For big directory trees the improvement is + dramatic. + * The way developers can extend Ant's property expansion algorithm has been + rewritten (breaking the older API) to be easier to use and be more + powerful. The whole local properties mechanism is implemented using that + API and could be implemented in a separate library without changes in Ant's + core. Things like the yet-to-be-released props Antlib can now provide often + required "scripty" fuctions without touching Ant itself. At the same time + the if and unless attributes have been rewritten to do the expected thing + if applied to a property expansion (i.e. if="${foo}" will mean "yes, do it" + if ${foo} expands to true, in Ant 1.7.1 it would mean "no" unless a + property named "true" existed). This adds "testing conditions" as a new + use-case to property expansion. + * A new top-level element assists in writing re-usable + build files that are meant to be imported. has a name and + a dependency-list like and can be used like a from the + command line or a dependency-list but the importing build file can add + targets to the 's depends list. + * Ant now requires Java 1.4 or later new task include provides an alternative + to that should be preferred when you don't want to override any + targets + * numerous bug fixes and improvements as documented in + Bugzilla and in WHATSNEW +- merge the nodeps and trax packages to main one +- build ant-antlr.spec using openjdk +- add ant-apache-xalan2 and ant-testutil ------------------------------------------------------------------- Fri Apr 9 10:41:42 UTC 2010 - mvyskocil@suse.cz diff --git a/ant.spec b/ant.spec index 6fadaf7..40973de 100644 --- a/ant.spec +++ b/ant.spec @@ -1,88 +1,88 @@ +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. # -# spec file for package ant (Version 1.7.1) +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. # -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} +%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} +%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} +%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# +%global bootstrap 1 -# norootforbuild +%if %with bootstrap +%global build_javadoc 0 +%else +%global build_javadoc 1 +%endif -%define ant_home %{_datadir}/ant -%define section free -%define cvs_name apache-ant -%define major_version 1.7 -%define bootstrap 1 -%define real_name ant +%global with_manifest_only 0 + +%global ant_home %{_datadir}/ant + +%global major_version 1.8 +%global cvs_version 1.8.2 Name: ant -# This line is not a comment, please do not remove it! -#%(sh %{_sourcedir}/ant-antlr-prepare.sh %{_sourcedir} %{name}) -Version: 1.7.1 -Release: 15 -Summary: Java-based build tool -License: Apache Software License .. -Url: http://jakarta.apache.org/ +Version: 1.8.2 +Release: 0 +License: ASL 2.0 +%if %bootstrap +Summary: Build tool for java +%else +Summary: Antlr Task for ant +%endif +URL: http://ant.apache.org/ Group: Development/Tools/Building -# rm src/etc/testcases/taskdefs/zip/test.exe -Source0: %{cvs_name}-%{version}-src-suse.tar.bz2 -Source2: %{cvs_name}-%{major_version}.ant.conf -Source1: http://repo1.maven.org/maven2/org/apache/ant/ant/1.7.1/ant-1.7.1.pom -Source3: http://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom -Source4: http://repo1.maven.org/maven2/org/apache/ant/ant-netrexx/1.7.1/ant-netrexx-1.7.1.pom -Source5: http://repo1.maven.org/maven2/org/apache/ant/ant-starteam/1.7.1/ant-starteam-1.7.1.pom -Source6: http://repo1.maven.org/maven2/org/apache/ant/ant-stylebook/1.7.1/ant-stylebook-1.7.1.pom -Source7: http://repo1.maven.org/maven2/org/apache/ant/ant-weblogic/1.7.1/ant-weblogic-1.7.1.pom -Source8: http://repo1.maven.org/maven2/org/apache/ant/ant-antlr/1.7.1/ant-antlr-1.7.1.pom -Source9: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bsf/1.7.1/ant-apache-bsf-1.7.1.pom -Source10: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-resolver/1.7.1/ant-apache-resolver-1.7.1.pom -Source11: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom -Source12: http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom -#Source13: http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom -Source14: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom -Source15: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom -Source16: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-oro/1.7.1/ant-apache-oro-1.7.1.pom -Source17: http://repo1.maven.org/maven2/org/apache/ant/ant-apache-regexp/1.7.1/ant-apache-regexp-1.7.1.pom -Source18: http://repo1.maven.org/maven2/org/apache/ant/ant-javamail/1.7.1/ant-javamail-1.7.1.pom -Source19: http://repo1.maven.org/maven2/org/apache/ant/ant-jdepend/1.7.1/ant-jdepend-1.7.1.pom -Source20: http://repo1.maven.org/maven2/org/apache/ant/ant-jmf/1.7.1/ant-jmf-1.7.1.pom -Source21: http://repo1.maven.org/maven2/org/apache/ant/ant-jsch/1.7.1/ant-jsch-1.7.1.pom -Source22: http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.1/ant-junit-1.7.1.pom -Source23: http://repo1.maven.org/maven2/org/apache/ant/ant-nodeps/1.7.1/ant-nodeps-1.7.1.pom -Source24: http://repo1.maven.org/maven2/org/apache/ant/ant-swing/1.7.1/ant-swing-1.7.1.pom -Source25: http://repo1.maven.org/maven2/org/apache/ant/ant-trax/1.7.1/ant-trax-1.7.1.pom -Source26: http://repo1.maven.org/maven2/org/apache/ant/ant-parent/1.7.1/ant-parent-1.7.1.pom -Source1000: ant-antlr-prepare.sh -Source1001: README.PACKAGER -# Fix some places where copies of classes are included in the wrong jarfiles -Patch0: apache-ant-jars.patch -Patch2: apache-ant-gnu-classpath.patch +Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 +Source2: apache-ant-%{major_version}.ant.conf +Source1000: pre_checkin.sh + +Patch1: apache-ant-bz163689.patch Patch3: apache-ant-no-test-jar.patch -# SUSE patches -Patch103: apache-ant-source-level.patch -BuildRequires: jpackage-utils >= 1.7.5 +Patch4: apache-ant-class-path-in-manifest.patch + +%if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel +%else +BuildRequires: java-devel >= 1.5.0 +%endif +BuildRequires: jpackage-utils >= 1.7.5 BuildRequires: antlr-bootstrap -#!BuildIgnore: antlr antlr-java BuildRequires: unzip BuildRequires: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap -#BuildRequires: jaxp_transform_impl BuildRequires: xalan-j2 -BuildRequires: ant +BuildRequires: ant = %{version} BuildRequires: junit BuildRequires: xml-commons-apis BuildRequires: xerces-j2 +#!BuildIgnore: antlr %endif %if %bootstrap Requires: xerces-j2 >= 2.7.1-2 @@ -91,6 +91,12 @@ Requires: xml-commons-apis Requires: xml-commons-resolver Requires: jpackage-utils >= 1.7.5 Requires: java-devel >= 1.5.0 +Obsoletes: apache-ant < %{version} +Provides: apache-ant = %{version} +Obsoletes: ant-nodeps < %{version} +Provides: ant-nodeps = %{version} +Obsoletes: ant-trax < %{version} +Provides: ant-trax = %{version} %else # ant-antlr requires Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) @@ -99,8 +105,6 @@ Provides: ant-antlr = %{version}-%{release} %endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: apache-ant -Provides: apache-ant %description Apache Ant is a Java-based build tool. In theory, it is kind of like @@ -153,17 +157,6 @@ This package contains optional jmf tasks for Apache Ant. -%package -n ant-nodeps -License: Apache Software License .. -Summary: Optional tasks for ant -Group: Development/Tools/Building -Requires: ant = %{version} -Provides: ant-nodeps = %{version}-%{release} - -%description -n ant-nodeps -Apache Ant is a Java-based build tool. - -This package contains optional tasks for Apache Ant. @@ -181,22 +174,6 @@ This package contains optional swing tasks for Apache Ant. -%package -n ant-trax -License: Apache Software License .. -Summary: Optional trax tasks for ant -Group: Development/Tools/Building -Requires: ant = %{version} -Requires: jaxp_transform_impl -Provides: ant-trax = %{version}-%{release} -# The ant-xalan jar has been merged into the ant-trax one -Obsoletes: ant-xalan2 < %{version}-%{release} -Provides: ant-xalan2 = %{version}-%{release} - -%description -n ant-trax -Apache Ant is a Java-based build tool. - -This package contains optional trax tasks for Apache Ant. - %package -n ant-scripts @@ -283,6 +260,7 @@ This package contains optional commons net tasks for Apache Ant. +# Disable because we don't ship the dependencies %if 0 %package -n ant-jai @@ -306,9 +284,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: bcel BuildRequires: bcel -Provides: ant-apache-bcel = %{version}-%{release} -Provides: ant-jakarta-bcel = %{version}-%{release} -Obsoletes: ant-jakarta-bcel < %{version}-%{release} +Provides: ant-apache-bcel = %{version} +Provides: ant-jakarta-bcel = %{version} +Obsoletes: ant-jakarta-bcel < %{version} %description -n ant-apache-bcel Apache Ant is a Java-based build tool. @@ -324,9 +302,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: log4j BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version}-%{release} -Provides: ant-jakarta-log4j = %{version}-%{release} -Obsoletes: ant-jakarta-log4j < %{version}-%{release} +Provides: ant-apache-log4j = %{version} +Provides: ant-jakarta-log4j = %{version} +Obsoletes: ant-jakarta-log4j < %{version} %description -n ant-apache-log4j Apache Ant is a Java-based build tool. @@ -342,9 +320,9 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: oro BuildRequires: oro -Provides: ant-apache-oro = %{version}-%{release} -Provides: ant-jakarta-oro = %{version}-%{release} -Obsoletes: ant-jakarta-oro < %{version}-%{release} +Provides: ant-apache-oro = %{version} +Provides: ant-jakarta-oro = %{version} +Obsoletes: ant-jakarta-oro < %{version} %description -n ant-apache-oro Apache Ant is a Java-based build tool. @@ -360,27 +338,35 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: regexp BuildRequires: regexp -Provides: ant-apache-regexp = %{version}-%{release} -Provides: ant-jakarta-regexp = %{version}-%{release} -Obsoletes: ant-jakarta-regexp < %{version}-%{release} +Provides: ant-apache-regexp = %{version} +Provides: ant-jakarta-regexp = %{version} +Obsoletes: ant-jakarta-regexp < %{version} %description -n ant-apache-regexp Apache Ant is a Java-based build tool. This package contains optional apache regexp tasks for Apache Ant. +%package -n ant-apache-xalan2 +Summary: Optional apache xalan2 tasks for ant +Group: Development/Tools/Building +BuildRequires: regexp +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) +Requires: regexp +Provides: ant-apache-xalan2 = %{version} + +%description -n ant-apache-xalan2 +Optional apache xalan2 tasks for %{name}. %package -n ant-javamail License: Other uncritical OpenSource License ; Common Development and Distribution License Summary: Optional javamail tasks for ant Group: Development/Tools/Building +BuildRequires: javamail >= 1.2-5jpp Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: javamail >= 1.2-5jpp -Requires: jaf >= 1.0.1-5jpp -BuildRequires: javamail >= 1.2-5jpp -BuildRequires: jaf >= 1.0.1-5jpp -Provides: ant-javamail = %{version}-%{release} +Provides: ant-javamail = %{version} %description -n ant-javamail Apache Ant is a Java-based build tool. @@ -396,7 +382,7 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jdepend BuildRequires: jdepend -Provides: ant-jdepend = %{version}-%{release} +Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. @@ -412,7 +398,7 @@ Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: jsch BuildRequires: jsch -Provides: ant-jsch = %{version}-%{release} +Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. @@ -427,13 +413,23 @@ Summary: Optional junit tasks for ant Group: Development/Tools/Building Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: junit -Provides: ant-junit = %{version}-%{release} +Provides: ant-junit = %{version} %description -n ant-junit Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. +%package -n ant-testutil +Summary: Test utility classes for ant +Group: Development/Tools/Building +Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) +Requires: junit +Provides: ant-testutil = %{version} + +%description -n ant-testutil +Test utility tasks for %{name}. + %package -n ant-manual @@ -461,204 +457,179 @@ This package contains the javadoc documentation for Apache Ant. %endif -# % package -n ant-scripts -# License: The Apache Software License -# Summary: Additional scripts for ant -# Group: Development/Tools/Building -# #AutoReqProv: no -# Requires: ant = %{version} -# Requires: /usr/bin/perl -# Requires: /usr/bin/python -# % description -n ant-scripts -# Apache Ant is a Java-based build tool. -# -# This package contains additional perl and python scripts for Apache -# Ant. %prep -%setup -q -n apache-ant-%{version} +%setup -q -n apache-ant-%{cvs_version} +#Fixup version +find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// +#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 + # Fix some places where copies of classes are included in the wrong jarfiles -%patch0 -p1 + +# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689). +%ifarch ppc64 s390x +%patch1 -p1 -b .sav1 +%endif + # Update ant to work with recent versions of GNU Classpath -%patch2 -p1 # When bootstrapping, we don't have junit %patch3 -p1 -%patch103 -b .target5 + +# Fix class-path-in-manifest rpmlint warning +%patch4 + # clean jar files -find . -name "*.jar" | %{_bindir}/xargs -t rm +%{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t rm + +#install jars +%if ! %bootstrap +build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver +%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__ > %{name}-perl.prov +#!/bin/sh +/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$' +__EOF__ +%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov +chmod +x %{__perl_provides} + + +# Requires: exclude bogus perl(the) +cat <<__EOF__ > %{name}-perl.req +#!/bin/sh +/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$' +__EOF__ +%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req +chmod +x %{__perl_requires} + # ----------------------------------------------------------------------------- %build export OPT_JAR_LIST=: %if ! %bootstrap -export CLASSPATH=$(build-classpath xerces-j2 xml-commons-apis antlr-bootstrap bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xml-commons-resolver) -%{ant} jars +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) +%{ant} -Dbuild.sysclasspath=first distribution %{ant} javadocs %else export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar export BOOTJAVAC_OPTS="-C -Wno-deprecated" -sh ./build.sh --noconfig jars +sh -x ./build.sh --noconfig jars %endif -# ----------------------------------------------------------------------------- %install # ANT_HOME and subdirs -mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc} +mkdir -p %{buildroot}%{ant_home}/{lib,etc} # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{real_name} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_javadir}/ant +install -d -m 755 %{buildroot}%{_datadir}/maven2/poms + +for jar in build/lib/*.jar +do + jarname=$(basename $jar .jar) + pomname="JPP.%{name}-${jarname}.pom" + + #Determine where to put it + case $jarname in +#These go into %%{_javadir}, pom files have different names + ant | ant-bootstrap | ant-launcher) %if %bootstrap -install -m 644 build/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-%{version}.jar -install -m 644 build/lib/ant-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-bootstrap-%{version}.jar -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}.pom -%add_to_maven_depmap org.apache.ant %{real_name} %{version} JPP %{real_name} -install -m 644 build/lib/ant-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}-launcher-%{version}.jar -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}-launcher.pom -%add_to_maven_depmap org.apache.ant %{real_name}-launcher %{version} JPP %{real_name}-launcher -install -m 644 build/lib/ant-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jmf-%{version}.jar -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jmf.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jmf %{version} JPP/%{real_name} %{real_name}-jmf -install -m 644 build/lib/ant-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-nodeps-%{version}.jar -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-nodeps.pom -%add_to_maven_depmap org.apache.ant %{real_name}-nodeps %{version} JPP/%{real_name} %{real_name}-nodeps -install -m 644 build/lib/ant-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-swing-%{version}.jar -install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-swing.pom -%add_to_maven_depmap org.apache.ant %{real_name}-swing %{version} JPP/%{real_name} %{real_name}-swing -install -m 644 build/lib/ant-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-trax-%{version}.jar -install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-trax.pom -%add_to_maven_depmap org.apache.ant %{real_name}-trax %{version} JPP/%{real_name} %{real_name}-trax -install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{real_name}-parent.pom -%add_to_maven_depmap org.apache.ant %{real_name}-parent %{version} JPP %{real_name}-parent -%endif #if %bootstrap -# optional jars -%if ! %bootstrap -#install -m 644 build/lib/ant-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-icontract-%{version}.jar -#install -m 644 build/lib/ant-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-netrexx-%{version}.jar -#install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-netrexx.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-netrexx %{version} JPP/%{real_name} %{real_name}-netrexx -#install -m 644 build/lib/ant-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-starteam-%{version}.jar -#install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-starteam.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-starteam %{version} JPP/%{real_name} %{real_name}-starteam -#install -m 644 build/lib/ant-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-stylebook-%{version}.jar -#install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-stylebook.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-stylebook %{version} JPP/%{real_name} %{real_name}-stylebook -#install -m 644 build/lib/ant-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-vaj-%{version}.jar -#install -m 644 build/lib/ant-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-weblogic-%{version}.jar -#install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-weblogic.pom -#% add_to_maven_depmap org.apache.ant %{real_name}-weblogic %{version} JPP/%{real_name} %{real_name}-weblogic -#install -m 644 build/lib/ant-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-xalan1-%{version}.jar -#install -m 644 build/lib/ant-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-xslp-%{version}.jar -install -m 644 build/lib/ant-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-antlr-%{version}.jar -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-antlr.pom -%add_to_maven_depmap org.apache.ant %{real_name}-antlr %{version} JPP/%{real_name} %{real_name}-antlr -install -m 644 build/lib/ant-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-bsf-%{version}.jar -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-bsf.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-bsf %{version} JPP/%{real_name} %{real_name}-apache-bsf -install -m 644 build/lib/ant-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-resolver-%{version}.jar -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-resolver.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-resolver %{version} JPP/%{real_name} %{real_name}-apache-resolver -install -m 644 build/lib/ant-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-commons-logging-%{version}.jar -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-commons-logging.pom -%add_to_maven_depmap org.apache.ant %{real_name}-commons-logging %{version} JPP/%{real_name} %{real_name}-commons-logging -install -m 644 build/lib/ant-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-commons-net-%{version}.jar -install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-commons-net.pom -%add_to_maven_depmap org.apache.ant %{real_name}-commons-net %{version} JPP/%{real_name} %{real_name}-commons-net -#install -m 644 build/lib/ant-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jai-%{version}.jar -#install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jai.pom -#%add_to_maven_depmap org.apache.ant %{real_name}-jai %{version} JPP/%{real_name} %{real_name}-jai -install -m 644 build/lib/ant-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-bcel-%{version}.jar -install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-bcel.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-bcel %{version} JPP/%{real_name} %{real_name}-apache-bcel -install -m 644 build/lib/ant-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-log4j-%{version}.jar -install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-log4j.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-log4j %{version} JPP/%{real_name} %{real_name}-apache-log4j -install -m 644 build/lib/ant-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-oro-%{version}.jar -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-oro.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-oro %{version} JPP/%{real_name} %{real_name}-apache-oro -install -m 644 build/lib/ant-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-apache-regexp-%{version}.jar -install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-apache-regexp.pom -%add_to_maven_depmap org.apache.ant %{real_name}-apache-regexp %{version} JPP/%{real_name} %{real_name}-apache-regexp -ln -sf %{real_name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-bcel.jar -ln -sf %{real_name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-log4j.jar -ln -sf %{real_name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-oro.jar -ln -sf %{real_name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jakarta-regexp.jar -install -m 644 build/lib/ant-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-javamail-%{version}.jar -install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-javamail.pom -%add_to_maven_depmap org.apache.ant %{real_name}-javamail %{version} JPP/%{real_name} %{real_name}-javamail -install -m 644 build/lib/ant-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jdepend-%{version}.jar -install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jdepend.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jdepend %{version} JPP/%{real_name} %{real_name}-jdepend -install -m 644 build/lib/ant-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-jsch-%{version}.jar -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-jsch.pom -%add_to_maven_depmap org.apache.ant %{real_name}-jsch %{version} JPP/%{real_name} %{real_name}-jsch -install -m 644 build/lib/ant-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{real_name}/%{real_name}-junit-%{version}.jar -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{real_name}-%{real_name}-junit.pom -%add_to_maven_depmap org.apache.ant %{real_name}-junit %{version} JPP/%{real_name} %{real_name}-junit + destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom" +%else + continue %endif -# jar aliases + ;; +#Bootstracp builds an incomplete ant-junit, don't ship it %if %bootstrap -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *.jar; do ln -sf %{_javadir}/${jar} $RPM_BUILD_ROOT/%{ant_home}/lib/${jar}; done) + ant-junit) continue;; %endif -(cd $RPM_BUILD_ROOT%{_javadir}/%{real_name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir}/%{real_name} && for jar in *.jar; do ln -sf %{_javadir}/%{real_name}/${jar} $RPM_BUILD_ROOT/%{ant_home}/lib/${jar}; done) +#These go into %%{_javadir}/ant + *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; + esac + + #instal jar + install -m 644 ${jar} ${destdir}/${jarname}.jar + # jar aliases + ln -sf ../../java${destname}/${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar + + #bootstrap does not have a pom + [ $jarname == ant-bootstrap ] && continue + + #install pom + install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}%{_datadir}/maven2/poms/${pomname} + %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} +done + +%if %bootstrap +# add backward compatibility for nodeps jar that is now part of +# main jar +%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant + +#ant-parent pom +install -m 644 src/etc/poms/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-ant-parent.pom +%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent + # scripts: remove dos and os/2 scripts rm -f src/script/*.bat rm -f src/script/*.cmd -%if %bootstrap + # XSLs -cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc -rm -f $RPM_BUILD_ROOT%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl +cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc +rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %else -cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl $RPM_BUILD_ROOT%{ant_home}/etc +cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc %endif + %if %bootstrap # install everything else -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -p src/script/* $RPM_BUILD_ROOT%{_bindir} -#% else -# cp -p src/script/ant{,Run} $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} +cp -p src/script/* %{buildroot}%{_bindir}/ %endif -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d %if %bootstrap # default ant.conf -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.conf +mkdir -p %{buildroot}%{_sysconfdir} +cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/ant.conf + # OPT_JAR_LIST fragments -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d -echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jmf -echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/nodeps -echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/swing -echo "jaxp_transform_impl ant/ant-trax xalan-j2-serializer" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/trax -%endif #if bootstrap -%if ! %bootstrap -echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/antlr -echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-bsf -echo "xml-commons-resolver12 ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-resolver -echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/commons-logging -echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/commons-net -#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jai -echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-log4j -echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-oro -echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/apache-regexp -echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/javamail -echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jdepend -echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/jsch -echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{real_name}.d/junit +mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d +echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf +echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing +%else +echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr +echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf +echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver +echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net +#echo "jai ant/ant-jai" > %{buildroot}%{_sysconfdir}/ant.d/jai +echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel +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 "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 +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 "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit +echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil %endif %if ! %bootstrap # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} -cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/ant-%{version} +mkdir -p %{buildroot}%{_javadocdir}/ant +cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant %endif # fix link between manual and javadoc -(cd docs/manual; ln -sf %{_javadocdir}/%{real_name}-%{version} api) +(cd docs/manual; ln -sf %{_javadocdir}/%{name} api) %if %bootstrap -find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \ +find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \ -a ! -name ant-update.xsl \ -a ! -name changelog.xsl \ -a ! -name coverage-frames.xsl \ @@ -670,7 +641,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \ %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # ----------------------------------------------------------------------------- %post @@ -678,150 +649,112 @@ rm -rf $RPM_BUILD_ROOT %postun %update_maven_depmap -%if %bootstrap +%if %bootstrap %files %defattr(0644,root,root,0755) %doc KEYS LICENSE NOTICE README WHATSNEW -%config(noreplace) %{_sysconfdir}/%{real_name}.conf +%config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{real_name}.jar -%{_javadir}/%{real_name}-%{version}.jar -%{_javadir}/%{real_name}-launcher.jar -%{_javadir}/%{real_name}-launcher-%{version}.jar -%{_javadir}/%{real_name}-bootstrap.jar -%{_javadir}/%{real_name}-bootstrap-%{version}.jar -%dir %{_javadir}/%{real_name} +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-launcher.jar +%{_javadir}/%{name}-bootstrap.jar +%dir %{_javadir}/%{name} %dir %{ant_home} %dir %{ant_home}/etc %{ant_home}/etc/ant-update.xsl %{ant_home}/etc/changelog.xsl +%{ant_home}/etc/coverage-frames.xsl +%{ant_home}/etc/mmetrics-frames.xsl %{ant_home}/etc/log.xsl %{ant_home}/etc/tagdiff.xsl %{ant_home}/etc/junit-frames-xalan1.xsl -%if ! %bootstrap -%{ant_home}/etc/common2master.xsl -%endif +# % {ant_home}/etc/common2master.xsl +# % {ant_home}/etc/printFailingTests.xsl %dir %{ant_home}/lib +%dir %{_sysconfdir}/%{name}.d %{ant_home}/lib/ant.jar -%{ant_home}/lib/ant-%{version}.jar %{ant_home}/lib/ant-bootstrap.jar -%{ant_home}/lib/ant-bootstrap-%{version}.jar %{ant_home}/lib/ant-launcher.jar -%{ant_home}/lib/ant-launcher-%{version}.jar -%dir %{_sysconfdir}/%{real_name}.d +%dir %{_sysconfdir}/ant.d # % {_datadir}/maven2/poms/* %{_datadir}/maven2/poms/JPP-ant-launcher.pom %{_datadir}/maven2/poms/JPP-ant-parent.pom %{_datadir}/maven2/poms/JPP-ant.pom -%config %{_mavendepmapfragdir}/* -%dir %{_sysconfdir}/maven/fragments +%config(noreplace) %{_mavendepmapfragdir}/* +%config(noreplace) %dir %{_sysconfdir}/maven/fragments %dir %{_datadir}/maven2 %dir %{_datadir}/maven2/poms + %else # ant-antlr filelist - %files %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-antlr.jar -%{_javadir}/%{real_name}/%{real_name}-antlr-%{version}.jar -%{ant_home}/lib/%{real_name}-antlr.jar -%{ant_home}/lib/%{real_name}-antlr-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/antlr +%{_javadir}/ant/ant-antlr.jar +%{ant_home}/lib/ant-antlr.jar +%config(noreplace) %{_sysconfdir}/ant.d/antlr %{_datadir}/maven2/poms/JPP.ant-ant-antlr.pom %config %{_mavendepmapfragdir}/ant-antlr %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %endif + ### Basic ant subpackages %if %bootstrap - %files -n ant-jmf %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jmf.jar -%{_javadir}/%{real_name}/%{real_name}-jmf-%{version}.jar -%{ant_home}/lib/%{real_name}-jmf.jar -%{ant_home}/lib/%{real_name}-jmf-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jmf +%{_javadir}/ant/ant-jmf.jar +%{ant_home}/lib/ant-jmf.jar +%config(noreplace) %{_sysconfdir}/ant.d/jmf %{_datadir}/maven2/poms/JPP.ant-ant-jmf.pom -%files -n ant-nodeps -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-nodeps.jar -%{_javadir}/%{real_name}/%{real_name}-nodeps-%{version}.jar -%{ant_home}/lib/%{real_name}-nodeps.jar -%{ant_home}/lib/%{real_name}-nodeps-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/nodeps -%{_datadir}/maven2/poms/JPP.ant-ant-nodeps.pom - %files -n ant-swing %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-swing.jar -%{_javadir}/%{real_name}/%{real_name}-swing-%{version}.jar -%{ant_home}/lib/%{real_name}-swing.jar -%{ant_home}/lib/%{real_name}-swing-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/swing +%{_javadir}/ant/ant-swing.jar +%{ant_home}/lib/ant-swing.jar +%config(noreplace) %{_sysconfdir}/ant.d/swing %{_datadir}/maven2/poms/JPP.ant-ant-swing.pom -%files -n ant-trax -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-trax.jar -%{_javadir}/%{real_name}/%{real_name}-trax-%{version}.jar -%{ant_home}/lib/%{real_name}-trax.jar -%{ant_home}/lib/%{real_name}-trax-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/trax -%{ant_home}/etc/mmetrics-frames.xsl -%{ant_home}/etc/coverage-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-trax.pom - %files -n ant-scripts %defattr(0755,root,root,0755) %{_bindir}/*.pl %{_bindir}/*.py* %endif #if bootstrap -%if ! %bootstrap +%if ! %bootstrap %files -n ant-apache-bsf %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-bsf.jar -%{_javadir}/%{real_name}/%{real_name}-apache-bsf-%{version}.jar -%{ant_home}/lib/%{real_name}-apache-bsf.jar -%{ant_home}/lib/%{real_name}-apache-bsf-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-bsf +%{_javadir}/ant/ant-apache-bsf.jar +%{ant_home}/lib/ant-apache-bsf.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-bsf %{_datadir}/maven2/poms/JPP.ant-ant-apache-bsf.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-resolver %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-resolver.jar -%{_javadir}/%{real_name}/%{real_name}-apache-resolver-%{version}.jar -%{ant_home}/lib/%{real_name}-apache-resolver.jar -%{ant_home}/lib/%{real_name}-apache-resolver-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-resolver +%{_javadir}/ant/ant-apache-resolver.jar +%{ant_home}/lib/ant-apache-resolver.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-resolver %{_datadir}/maven2/poms/JPP.ant-ant-apache-resolver.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-commons-logging %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-commons-logging.jar -%{_javadir}/%{real_name}/%{real_name}-commons-logging-%{version}.jar -%{ant_home}/lib/%{real_name}-commons-logging.jar -%{ant_home}/lib/%{real_name}-commons-logging-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/commons-logging +%{_javadir}/ant/ant-commons-logging.jar +%{ant_home}/lib/ant-commons-logging.jar +%config(noreplace) %{_sysconfdir}/ant.d/commons-logging %{_datadir}/maven2/poms/JPP.ant-ant-commons-logging.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-commons-net %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-commons-net.jar -%{_javadir}/%{real_name}/%{real_name}-commons-net-%{version}.jar -%{ant_home}/lib/%{real_name}-commons-net.jar -%{ant_home}/lib/%{real_name}-commons-net-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/commons-net +%{_javadir}/ant/ant-commons-net.jar +%{ant_home}/lib/ant-commons-net.jar +%config(noreplace) %{_sysconfdir}/ant.d/commons-net %{_datadir}/maven2/poms/JPP.ant-ant-commons-net.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms @@ -830,84 +763,71 @@ rm -rf $RPM_BUILD_ROOT %files -n ant-jai %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jai.jar -%{_javadir}/%{real_name}/%{real_name}-jai-%{version}.jar -%{ant_home}/lib/%{real_name}-jai.jar -%{ant_home}/lib/%{real_name}-jai-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jai +%{_javadir}/ant/ant-jai.jar +%{ant_home}/lib/ant-jai.jar +%config(noreplace) %{_sysconfdir}/ant.d/jai %endif %files -n ant-apache-bcel %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-bcel.jar -%{_javadir}/%{real_name}/%{real_name}-apache-bcel-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-bcel.jar -%{ant_home}/lib/%{real_name}-apache-bcel.jar -%{ant_home}/lib/%{real_name}-apache-bcel-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-bcel.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-bcel +%{_javadir}/ant/ant-apache-bcel.jar +%{_javadir}/ant/ant-jakarta-bcel.jar +%{ant_home}/lib/ant-apache-bcel.jar +%{ant_home}/lib/ant-jakarta-bcel.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-bcel %{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-log4j %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-log4j.jar -%{_javadir}/%{real_name}/%{real_name}-apache-log4j-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-log4j.jar -%{ant_home}/lib/%{real_name}-apache-log4j.jar -%{ant_home}/lib/%{real_name}-apache-log4j-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-log4j.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-log4j +%{_javadir}/ant/ant-apache-log4j.jar +%{_javadir}/ant/ant-jakarta-log4j.jar +%{ant_home}/lib/ant-apache-log4j.jar +%{ant_home}/lib/ant-jakarta-log4j.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-log4j %{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-oro %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-oro.jar -%{_javadir}/%{real_name}/%{real_name}-apache-oro-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-oro.jar -%{ant_home}/lib/%{real_name}-apache-oro.jar -%{ant_home}/lib/%{real_name}-apache-oro-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-oro.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-oro -%{ant_home}/etc/maudit-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom +%{_javadir}/ant/ant-apache-oro.jar +%{_javadir}/ant/ant-jakarta-oro.jar +%{ant_home}/lib/ant-apache-oro.jar +%{ant_home}/lib/ant-jakarta-oro.jar %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-apache-regexp -%defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-apache-regexp.jar -%{_javadir}/%{real_name}/%{real_name}-apache-regexp-%{version}.jar -%{_javadir}/%{real_name}/%{real_name}-jakarta-regexp.jar -%{ant_home}/lib/%{real_name}-apache-regexp.jar -%{ant_home}/lib/%{real_name}-apache-regexp-%{version}.jar -%{ant_home}/lib/%{real_name}-jakarta-regexp.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/apache-regexp +%defattr(-,root,root,-) +%{_javadir}/ant/ant-apache-regexp.jar +%{ant_home}/lib/ant-apache-regexp.jar +%config(noreplace) %{_sysconfdir}/ant/apache-regexp %{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms +%files -n ant-apache-xalan2 +%defattr(-,root,root,-) +%{_javadir}/ant/ant-apache-xalan2.jar +%{ant_home}/lib/ant-apache-xalan2.jar +%config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 + %files -n ant-javamail %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-javamail.jar -%{_javadir}/%{real_name}/%{real_name}-javamail-%{version}.jar -%{ant_home}/lib/%{real_name}-javamail.jar -%{ant_home}/lib/%{real_name}-javamail-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/javamail +%{_javadir}/ant/ant-javamail.jar +%{ant_home}/lib/ant-javamail.jar +%config(noreplace) %{_sysconfdir}/ant.d/javamail %{_datadir}/maven2/poms/JPP.ant-ant-javamail.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-jdepend %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jdepend.jar -%{_javadir}/%{real_name}/%{real_name}-jdepend-%{version}.jar -%{ant_home}/lib/%{real_name}-jdepend.jar -%{ant_home}/lib/%{real_name}-jdepend-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jdepend +%{_javadir}/ant/ant-jdepend.jar +%{ant_home}/lib/ant-jdepend.jar +%config(noreplace) %{_sysconfdir}/ant.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl %{_datadir}/maven2/poms/JPP.ant-ant-jdepend.pom @@ -916,35 +836,37 @@ rm -rf $RPM_BUILD_ROOT %files -n ant-jsch %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-jsch.jar -%{_javadir}/%{real_name}/%{real_name}-jsch-%{version}.jar -%{ant_home}/lib/%{real_name}-jsch.jar -%{ant_home}/lib/%{real_name}-jsch-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/jsch +%{_javadir}/ant/ant-jsch.jar +%{ant_home}/lib/ant-jsch.jar +%config(noreplace) %{_sysconfdir}/ant.d/jsch %{_datadir}/maven2/poms/JPP.ant-ant-jsch.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms %files -n ant-junit %defattr(0644,root,root,0755) -%{_javadir}/%{real_name}/%{real_name}-junit.jar -%{_javadir}/%{real_name}/%{real_name}-junit-%{version}.jar -%{ant_home}/lib/%{real_name}-junit.jar -%{ant_home}/lib/%{real_name}-junit-%{version}.jar -%config(noreplace) %{_sysconfdir}/%{real_name}.d/junit +%{_javadir}/ant/ant-junit.jar +%{ant_home}/lib/ant-junit.jar +%config(noreplace) %{_sysconfdir}/ant.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %{_datadir}/maven2/poms/JPP.ant-ant-junit.pom %dir %{_datadir}/maven2/ %dir %{_datadir}/maven2/poms +%files -n ant-testutil +%defattr(-,root,root,-) +%{_javadir}/ant/ant-testutil.jar +%{ant_home}/lib/ant-testutil.jar +%config(noreplace) %{_sysconfdir}/ant.d/testutil + %files -n ant-manual %defattr(0644,root,root,0755) %doc docs/* %files -n ant-javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{real_name}-%{version} +%{_javadocdir}/ant-%{version} %endif %changelog diff --git a/apache-ant-1.7.1-src-suse.tar.bz2 b/apache-ant-1.7.1-src-suse.tar.bz2 deleted file mode 100644 index 239fd6a..0000000 --- a/apache-ant-1.7.1-src-suse.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:305176617ba522c6b272fdd77d2063cd6231f5fa43a97bcd02dab7a1a365b3ea -size 6923290 diff --git a/apache-ant-1.8.2-src.tar.bz2 b/apache-ant-1.8.2-src.tar.bz2 new file mode 100644 index 0000000..f94b777 --- /dev/null +++ b/apache-ant-1.8.2-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30ac9766d0e2c125d39c9871178f35084d4b75b08f628a4eb1dbae15ed89ce53 +size 5894278 diff --git a/apache-ant-1.7.ant.conf b/apache-ant-1.8.ant.conf similarity index 94% rename from apache-ant-1.7.ant.conf rename to apache-ant-1.8.ant.conf index ade5dba..0224f70 100644 --- a/apache-ant-1.7.ant.conf +++ b/apache-ant-1.8.ant.conf @@ -1,4 +1,4 @@ -# ant.conf (Ant 1.7.x) +# ant.conf (Ant 1.8.x) # JPackage Project # Validate --noconfig setting in case being invoked diff --git a/apache-ant-bz163689.patch b/apache-ant-bz163689.patch new file mode 100644 index 0000000..03048eb --- /dev/null +++ b/apache-ant-bz163689.patch @@ -0,0 +1,91 @@ +--- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java.sav1 2010-02-01 19:37:34.000000000 -0500 ++++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java 2010-03-12 12:31:19.002865860 -0500 +@@ -173,32 +173,12 @@ + * @throws Exception on error + */ + public void transform(File infile, File outfile) throws Exception { +- if (transformer == null) { +- createTransformer(); +- } +- +- InputStream fis = null; +- OutputStream fos = null; +- try { +- fis = new BufferedInputStream(new FileInputStream(infile)); +- fos = new BufferedOutputStream(new FileOutputStream(outfile)); +- StreamResult res = new StreamResult(fos); +- // not sure what could be the need of this... +- res.setSystemId(JAXPUtils.getSystemId(outfile)); +- Source src = getSource(fis, infile); +- +- // set parameters on each transformation, maybe something has changed +- //(e.g. value of file name parameter) +- setTransformationParameters(); +- +- transformer.transform(src, res); +- } finally { +- // make sure to close all handles, otherwise the garbage +- // collector will close them...whenever possible and +- // Windows may complain about not being able to delete files. +- FileUtils.close(fis); +- FileUtils.close(fos); +- } ++ if (logger != null) { ++ logger.log("The style task is disabled on this platform"); ++ logger.log( ++ "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689"); ++ } ++ new FileOutputStream(outfile).close(); + } + + /** +--- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java.sav1 2010-02-01 19:37:34.000000000 -0500 ++++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java 2010-03-12 12:32:28.812991662 -0500 +@@ -287,45 +287,8 @@ + * @throws BuildException if failonerror is true and an error happens + */ + public void execute() throws BuildException { +- try { +- int fileProcessed = 0; +- if (file == null && (filesets.size() == 0)) { +- throw new BuildException( +- "Specify at least one source - " + "a file or a fileset."); +- } +- +- +- +- if (file != null) { +- if (file.exists() && file.canRead() && file.isFile()) { +- doValidate(file); +- fileProcessed++; +- } else { +- String errorMsg = "File " + file + " cannot be read"; +- if (failOnError) { +- throw new BuildException(errorMsg); +- } else { +- log(errorMsg, Project.MSG_ERR); +- } +- } +- } +- +- for (int i = 0; i < filesets.size(); i++) { +- +- FileSet fs = (FileSet) filesets.elementAt(i); +- DirectoryScanner ds = fs.getDirectoryScanner(getProject()); +- String[] files = ds.getIncludedFiles(); +- +- for (int j = 0; j < files.length; j++) { +- File srcFile = new File(fs.getDir(getProject()), files[j]); +- doValidate(srcFile); +- fileProcessed++; +- } +- } +- onSuccessfulValidation(fileProcessed); +- } finally { +- cleanup(); +- } ++ log("The xmlvalidate task is disabled on this platform"); ++ log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689"); + } + + /** diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch new file mode 100644 index 0000000..e8fd962 --- /dev/null +++ b/apache-ant-class-path-in-manifest.patch @@ -0,0 +1,15 @@ +--- build.xml.orig 2010-12-28 14:45:24.000000000 +0200 ++++ build.xml 2010-12-28 14:46:40.843377673 +0200 +@@ -730,10 +730,10 @@ + + + +- ++ + + + diff --git a/apache-ant-gnu-classpath.patch b/apache-ant-gnu-classpath.patch deleted file mode 100644 index 96f6c0f..0000000 --- a/apache-ant-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-jars.patch b/apache-ant-jars.patch deleted file mode 100644 index 6ea7cb7..0000000 --- a/apache-ant-jars.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- apache-ant-1.7.1/build.xml.orig 2008-06-27 01:05:23.000000000 -0400 -+++ apache-ant-1.7.1/build.xml 2008-07-10 16:40:11.318448411 -0400 -@@ -770,6 +770,7 @@ - - - -+ - - - -@@ -849,6 +850,7 @@ - - - -+ - - - diff --git a/apache-ant-no-test-jar.patch b/apache-ant-no-test-jar.patch index 4030da1..d227c6d 100644 --- a/apache-ant-no-test-jar.patch +++ b/apache-ant-no-test-jar.patch @@ -1,11 +1,13 @@ ---- 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 @@ - =================================================================== - --> - - - +Index: apache-ant-1.8.0/build.xml +=================================================================== +--- apache-ant-1.8.0.orig/build.xml 2010-04-13 14:09:27.501531982 +0200 ++++ apache-ant-1.8.0/build.xml 2010-04-13 14:57:08.321408006 +0200 +@@ -832,7 +832,7 @@ + =================================================================== + --> + + + diff --git a/apache-ant-source-level.patch b/apache-ant-source-level.patch deleted file mode 100644 index 7e21208..0000000 --- a/apache-ant-source-level.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- build.xml -+++ build.xml -@@ -64,8 +64,8 @@ - - - -- -- -+ -+ - - - diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..0e88972 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,5 @@ +#!/bin/sh +EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n" +sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/; + s/^\(Name:.*\)$/\1-antlr/; + " < ant.spec > ant-antlr.spec