[ant] - Update to ant 1.8.1 - Update no-test-jar patch - Update class-path-in-manifest patch - Drop gnu-cl
Orion Poplawski
orion at fedoraproject.org
Fri Aug 20 21:25:31 UTC 2010
commit d66596611085e3916e024dd89f104589c86e990a
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri Aug 20 15:25:21 2010 -0600
- Update to ant 1.8.1
- Update no-test-jar patch
- Update class-path-in-manifest patch
- Drop gnu-classpath patch
- Retire trax subpackage no longer shipped
- Add xalan2 subpackage and support for junitreport task
- Drop old jakarta jar aliases
.gitignore | 1 +
ant-1.7.1.pom | 232 ----------------
ant-antlr-1.7.1.pom | 75 -----
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.spec | 285 +++++++-------------
apache-ant-1.7.0-javah.patch | 22 --
apache-ant-1.7.ant.conf => apache-ant-1.8.ant.conf | 2 +-
apache-ant-class-path-in-manifest.patch | 30 +-
apache-ant-gnu-classpath.patch | 35 ---
apache-ant-jars.patch | 18 --
apache-ant-no-test-jar.patch | 22 +-
apache-ant-r529855.patch | 18 --
sources | 2 +-
34 files changed, 133 insertions(+), 2302 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38bc88e..01c4031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
apache-ant-1.7.1-src.tar.bz2
+/apache-ant-1.8.1-src.tar.bz2
diff --git a/ant.spec b/ant.spec
index 69b4b45..8a731e5 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,14 +50,14 @@
%define ant_home %{_datadir}/ant
%define section free
-%define major_version 1.7
-%define cvs_version 1.7.1
+%define major_version 1.8
+%define cvs_version 1.8.1
Name: ant
-Version: 1.7.1
-Release: 12%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
Epoch: 0
-Summary: Ant build tool for java
+Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
License: ASL 2.0
@@ -65,35 +65,9 @@ URL: http://ant.apache.org/
Group: Development/Build Tools
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
Source2: apache-ant-%{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
# Fix some places where copies of classes are included in the wrong jarfiles
Patch1: apache-ant-bz163689.patch
-Patch2: apache-ant-gnu-classpath.patch
Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch
@@ -104,6 +78,7 @@ BuildRequires: jaxp_transform_impl
BuildRequires: ant
BuildRequires: junit
BuildRequires: xml-commons-jaxp-1.3-apis
+BuildRequires: xalan-j2
BuildRequires: xerces-j2
%endif
@@ -134,6 +109,8 @@ Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
Provides: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-core < %{epoch}:%{version}-%{release}
Provides: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-trax < %{epoch}:%{version}-%{release}
+Provides: %{name}-trax = %{epoch}:%{version}-%{release}
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
%endif
@@ -192,23 +169,6 @@ Optional swing tasks for %{name}.
%description swing -l fr
Taches swing optionelles pour %{name}.
-%package trax
-Summary: Optional trax tasks for %{name}
-Group: Development/Build Tools
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: jaxp_transform_impl
-Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
-Provides: ant-trax = %{epoch}:%{version}-%{release}
-# The ant-xalan jar has been merged into the ant-trax one
-Obsoletes: ant-xalan2 < %{epoch}:%{version}-%{release}
-Provides: ant-xalan2 = %{epoch}:%{version}-%{release}
-
-%description trax
-Optional trax tasks for %{name}.
-
-%description trax -l fr
-Taches trax optionelles pour %{name}.
-
%if %without bootstrap
%if %{with_manifest_only}
%package manifest-only
@@ -390,6 +350,21 @@ Optional apache regexp tasks for %{name}.
%description apache-regexp -l fr
Taches apache regexp optionelles pour %{name}.
+%package apache-xalan2
+Summary: Optional apache xalan2 tasks for %{name}
+Group: Development/Build Tools
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
+Requires: regexp
+BuildRequires: regexp
+Provides: ant-apache-xalan2 = %{epoch}:%{version}-%{release}
+
+%description apache-xalan2
+Optional apache xalan2 tasks for %{name}.
+
+%description apache-xalan2 -l fr
+Taches apache xalan2 optionelles pour %{name}.
+
%package javamail
Summary: Optional javamail tasks for %{name}
Group: Development/Build Tools
@@ -443,6 +418,7 @@ Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
Requires: junit
+Requires: xalan-j2
Provides: ant-junit = %{epoch}:%{version}-%{release}
%description junit
@@ -500,18 +476,20 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t
%patch1 -p1
%endif
-# Update ant to work with recent versions of GNU Classpath
-%patch2 -p1
-
# When bootstrapping, we don't have junit
%patch3 -p1
# Fix class-path-in-manifest rpmlint warning
-%patch4 -p0
+%patch4 -p1
# clean jar files
find . -name "*.jar" | %{_bindir}/xargs -t rm
+#install jars
+%if %without bootstrap
+build-jar-repository -s -p lib/optional 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
+%endif
+
# Fix file-not-utf8 rpmlint warning
iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
mv KEYS.utf8 KEYS
@@ -540,9 +518,9 @@ chmod +x %{__perl_requires}
%build
export OPT_JAR_LIST=:
%if %without bootstrap
-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 xml-commons-resolver)
%{ant} jars
%if %{build_javadoc}
+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} javadocs
%endif
%else
@@ -560,103 +538,42 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 build/lib/ant.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 build/lib/ant-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bootstrap-%{version}.jar
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.ant %{name} %{version} JPP %{name}
-install -m 644 build/lib/ant-launcher.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-launcher.pom
-%add_to_maven_depmap org.apache.ant %{name}-launcher %{version} JPP %{name}-launcher
-
-install -m 644 build/lib/ant-jmf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jmf-%{version}.jar
-install -m 644 %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jmf.pom
-%add_to_maven_depmap org.apache.ant %{name}-jmf %{version} JPP/%{name} %{name}-jmf
-install -m 644 build/lib/ant-nodeps.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
-install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-nodeps.pom
-%add_to_maven_depmap org.apache.ant %{name}-nodeps %{version} JPP/%{name} %{name}-nodeps
-install -m 644 build/lib/ant-swing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swing-%{version}.jar
-install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-swing.pom
-%add_to_maven_depmap org.apache.ant %{name}-swing %{version} JPP/%{name} %{name}-swing
-install -m 644 build/lib/ant-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-trax.pom
-%add_to_maven_depmap org.apache.ant %{name}-trax %{version} JPP/%{name} %{name}-trax
-
-# optional jars
-%if %without bootstrap
-%if %{with_manifest_only}
-install -m 644 build/lib/ant-icontract.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-icontract-%{version}.jar
-install -m 644 build/lib/ant-netrexx.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-netrexx-%{version}.jar
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-netrexx.pom
-%add_to_maven_depmap org.apache.ant %{name}-netrexx %{version} JPP/%{name} %{name}-netrexx
-install -m 644 build/lib/ant-starteam.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-starteam-%{version}.jar
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-starteam.pom
-%add_to_maven_depmap org.apache.ant %{name}-starteam %{version} JPP/%{name} %{name}-starteam
-install -m 644 build/lib/ant-stylebook.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-stylebook-%{version}.jar
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-stylebook.pom
-%add_to_maven_depmap org.apache.ant %{name}-stylebook %{version} JPP/%{name} %{name}-stylebook
-install -m 644 build/lib/ant-vaj.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-vaj-%{version}.jar
-install -m 644 build/lib/ant-weblogic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-weblogic-%{version}.jar
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-weblogic.pom
-%add_to_maven_depmap org.apache.ant %{name}-weblogic %{version} JPP/%{name} %{name}-weblogic
-install -m 644 build/lib/ant-xalan1.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xalan1-%{version}.jar
-install -m 644 build/lib/ant-xslp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-xslp-%{version}.jar
-%endif
-install -m 644 build/lib/ant-antlr.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-antlr-%{version}.jar
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-antlr.pom
-%add_to_maven_depmap org.apache.ant %{name}-antlr %{version} JPP/%{name} %{name}-antlr
-install -m 644 build/lib/ant-apache-bsf.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bsf.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-bsf %{version} JPP/%{name} %{name}-apache-bsf
-install -m 644 build/lib/ant-apache-resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-resolver.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-resolver %{version} JPP/%{name} %{name}-apache-resolver
-install -m 644 build/lib/ant-commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-logging.pom
-%add_to_maven_depmap org.apache.ant %{name}-commons-logging %{version} JPP/%{name} %{name}-commons-logging
-install -m 644 build/lib/ant-commons-net.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
-install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-commons-net.pom
-%add_to_maven_depmap org.apache.ant %{name}-commons-net %{version} JPP/%{name} %{name}-commons-net
-#install -m 644 build/lib/ant-jai.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jai-%{version}.jar
-#install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jai.pom
-#%add_to_maven_depmap org.apache.ant %{name}-jai %{version} JPP/%{name} %{name}-jai
-install -m 644 build/lib/ant-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
-install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-bcel.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-bcel %{version} JPP/%{name} %{name}-apache-bcel
-install -m 644 build/lib/ant-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-log4j.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-log4j %{version} JPP/%{name} %{name}-apache-log4j
-install -m 644 build/lib/ant-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
-install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-oro.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-oro %{version} JPP/%{name} %{name}-apache-oro
-install -m 644 build/lib/ant-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
-install -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-apache-regexp.pom
-%add_to_maven_depmap org.apache.ant %{name}-apache-regexp %{version} JPP/%{name} %{name}-apache-regexp
-ln -sf %{name}-apache-bcel.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
-ln -sf %{name}-apache-log4j.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
-ln -sf %{name}-apache-oro.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-oro.jar
-ln -sf %{name}-apache-regexp.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
-install -m 644 build/lib/ant-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-install -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-javamail.pom
-%add_to_maven_depmap org.apache.ant %{name}-javamail %{version} JPP/%{name} %{name}-javamail
-install -m 644 build/lib/ant-jdepend.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
-install -m 644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jdepend.pom
-%add_to_maven_depmap org.apache.ant %{name}-jdepend %{version} JPP/%{name} %{name}-jdepend
-install -m 644 build/lib/ant-jsch.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jsch-%{version}.jar
-install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-jsch.pom
-%add_to_maven_depmap org.apache.ant %{name}-jsch %{version} JPP/%{name} %{name}-jsch
-install -m 644 build/lib/ant-junit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-junit-%{version}.jar
-install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-junit.pom
-%add_to_maven_depmap org.apache.ant %{name}-junit %{version} JPP/%{name} %{name}-junit
-install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
-%add_to_maven_depmap org.apache.ant %{name}-parent %{version} JPP %{name}-parent
-%endif
-
-# jar aliases
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/%{name}/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
+
+for jar in build/lib/*.jar
+do
+ jarname=$(basename $jar .jar)
+
+ #Determine where to put it
+ case $jarname in
+#These go into %{_javadir}
+ ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";;
+#Bootstracp builds an incomplete ant-junit, don't ship it
+%if %with bootstrap
+ ant-junit) continue;;
+%endif
+#These go into %{_javadir}/ant
+ *) destdir=$RPM_BUILD_ROOT%{_javadir}/%{name}; destname="/%{name}";
+ esac
+
+ #instal jar
+ install -m 644 ${jar} ${destdir}/${jarname}-%{version}.jar
+ # jar aliases
+ ln -sf ${jarname}-%{version}.jar ${destdir}/${jarname}.jar
+ ln -sf ../../java${destname}/${jarname}.jar $RPM_BUILD_ROOT%{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 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-${jarname}.pom
+ %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname}
+done
+
+#ant-parent pom
+install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
+%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP/%{name} ant-parent
# scripts: remove dos and os/2 scripts
rm -f src/script/*.bat
@@ -682,7 +599,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps
echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
-echo "jaxp_transform_impl ant/ant-trax xalan-j2-serializer" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/trax
%if %without bootstrap
echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
@@ -694,6 +610,7 @@ echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache
echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
+echo "xalan-j2 ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
@@ -798,22 +715,6 @@ then
fi
%endif
-%if %{gcj_support}
-%post trax
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun trax
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%if %without bootstrap
%if %{gcj_support}
%post commons-net
@@ -915,6 +816,22 @@ fi
%endif
%if %{gcj_support}
+%post apache-xalan2
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun apache-xalan2
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
%post apache-resolver
if [ -x %{_bindir}/rebuild-gcj-db ]
then
@@ -1060,11 +977,14 @@ fi
%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 %without bootstrap
%{ant_home}/etc/common2master.xsl
+%{ant_home}/etc/printFailingTests.xsl
%endif
%dir %{ant_home}/lib
%{ant_home}/lib/%{name}.jar
@@ -1109,18 +1029,6 @@ fi
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
%endif
-%files trax
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/%{name}-trax.jar
-%{_javadir}/%{name}/%{name}-trax-%{version}.jar
-%{ant_home}/lib/%{name}-trax.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/trax
-%{ant_home}/etc/mmetrics-frames.xsl
-%{ant_home}/etc/coverage-frames.xsl
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-trax-%{version}.jar.*
-%endif
-
%if %without bootstrap
%if %{with_manifest_only}
%files manifest-only
@@ -1210,7 +1118,6 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-bcel.jar
%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-bcel.jar
%{ant_home}/lib/%{name}-apache-bcel.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
%if %{gcj_support}
@@ -1221,7 +1128,6 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-log4j.jar
%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-log4j.jar
%{ant_home}/lib/%{name}-apache-log4j.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
%if %{gcj_support}
@@ -1232,7 +1138,6 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-oro.jar
%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-oro.jar
%{ant_home}/lib/%{name}-apache-oro.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
%{ant_home}/etc/maudit-frames.xsl
@@ -1244,13 +1149,22 @@ fi
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-apache-regexp.jar
%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
-%{_javadir}/%{name}/%{name}-jakarta-regexp.jar
%{ant_home}/lib/%{name}-apache-regexp.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
%endif
+%files apache-xalan2
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-apache-xalan2.jar
+%{_javadir}/%{name}/%{name}-apache-xalan2-%{version}.jar
+%{ant_home}/lib/%{name}-apache-xalan2.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-xalan2-%{version}.jar.*
+%endif
+
%files javamail
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-javamail.jar
@@ -1314,6 +1228,15 @@ fi
# -----------------------------------------------------------------------------
%changelog
+* Mon Aug 16 2010 Orion Poplawski <orion at cora.nwra.com> 0:1.8.1-1
+- Update to ant 1.8.1
+- Update no-test-jar patch
+- Update class-path-in-manifest patch
+- Drop gnu-classpath patch
+- Retire trax subpackage no longer shipped
+- Add xalan2 subpackage and support for junitreport task
+- Drop old jakarta jar aliases
+
* Thu Aug 13 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.7.1-12
- Fix compile with commons-net 2.0.
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 f55de9f..e169839 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 <http://www.jpackage.org/>
# Validate --noconfig setting in case being invoked
diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch
index 7f2e474..b6ece6a 100644
--- a/apache-ant-class-path-in-manifest.patch
+++ b/apache-ant-class-path-in-manifest.patch
@@ -1,15 +1,15 @@
---- build.xml.orig 2008-09-25 09:14:02.000000000 -0400
-+++ build.xml 2008-09-25 09:14:16.000000000 -0400
-@@ -811,10 +811,10 @@
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
-- <manifest>
-+ <!-- <manifest>
- <attribute name="Class-Path"
- value="ant.jar xml-apis.jar xercesImpl.jar xalan.jar"/>
-- </manifest>
-+ </manifest> -->
- </jar>
-
- <jar destfile="${build.lib}/ant-nodeps.jar"
+--- apache-ant-1.8.1/build.xml.orig 2010-08-16 14:57:53.000000000 -0600
++++ apache-ant-1.8.1/build.xml 2010-08-16 14:58:52.066167872 -0600
+@@ -696,10 +696,10 @@
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
+- <manifest>
++ <!-- <manifest>
+ <attribute name="Class-Path"
+ value="ant.jar xalan.jar"/>
+- </manifest>
++ </manifest> -->
+ </jar>
+
+ <jar destfile="${build.lib}/ant-nodeps.jar"
diff --git a/apache-ant-no-test-jar.patch b/apache-ant-no-test-jar.patch
index ca05bd7..d180c53 100644
--- a/apache-ant-no-test-jar.patch
+++ b/apache-ant-no-test-jar.patch
@@ -1,11 +1,11 @@
---- 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 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
+--- apache-ant-1.8.1/build.xml.orig 2010-04-30 16:05:05.000000000 -0600
++++ apache-ant-1.8.1/build.xml 2010-08-16 12:19:41.227167815 -0600
+@@ -792,7 +792,7 @@
+ ===================================================================
+ -->
+ <target name="dist-lite"
+- depends="jars,test-jar"
++ depends="jars"
+ description="--> creates a minimum distribution to run Apache Ant">
+
+ <mkdir dir="${dist.dir}"/>
diff --git a/sources b/sources
index 3e4cc5f..0af1f4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d68db4a1ada5c91bcbf53cefd0c2fd7 apache-ant-1.7.1-src.tar.bz2
+8c31b30f6b9863d1fef4bdf484fc8507 apache-ant-1.8.1-src.tar.bz2
More information about the scm-commits
mailing list