[ant-contrib] Update to beta 3.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Dec 15 13:00:48 UTC 2011
commit a1fb130b3cbb24866893d442d4a3fa0e2d5e057e
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Thu Dec 15 15:00:34 2011 +0200
Update to beta 3.
.gitignore | 1 +
ant-contrib-1.0b2.pom => ant-contrib-1.0b3.pom | 10 ++-
ant-contrib-build_xml.patch | 89 ------------------------
ant-contrib.spec | 45 ++++++------
local-ivy.patch | 43 +++++++++++
sources | 2 +-
6 files changed, 73 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc5bfcc..801e988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ant-contrib-1.0b2-src.tar.gz
+ant-contrib-1.0b3-src.tar.bz2
diff --git a/ant-contrib-1.0b2.pom b/ant-contrib-1.0b3.pom
similarity index 77%
rename from ant-contrib-1.0b2.pom
rename to ant-contrib-1.0b3.pom
index 6ec867e..ca99233 100644
--- a/ant-contrib-1.0b2.pom
+++ b/ant-contrib-1.0b3.pom
@@ -4,10 +4,12 @@
<artifactId>ant-contrib</artifactId>
<packaging>jar</packaging>
<name>Ant-Contrib Tasks</name>
- <version>1.0b2</version>
+ <version>1.0b3</version>
<url>http://ant-contrib.sourceforge.net</url>
<licenses>
- <url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
+ <license>
+ <url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
+ </license>
</licenses>
<scm>
<url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
@@ -15,9 +17,9 @@
<description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
<dependencies>
<dependency>
- <groupId>ant</groupId>
+ <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.5</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 8e4a756..dd4a5a7 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -1,15 +1,15 @@
-%global beta_number b2
+%global beta_number b3
Summary: Collection of tasks for Ant
Name: ant-contrib
Version: 1.0
-Release: 0.14.%{beta_number}%{?dist}
+Release: 0.15.%{beta_number}%{?dist}
License: ASL 2.0
URL: http://ant-contrib.sourceforge.net/
Group: Development/Libraries
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}%{beta_number}-src.tar.gz
-Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b2/%{name}-1.0b2.pom
-Patch0: ant-contrib-build_xml.patch
+Source0: https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
+Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
+Patch0: local-ivy.patch
Patch2: ant-contrib-antservertest.patch
BuildRequires: jpackage-utils >= 1.5
BuildRequires: junit >= 3.8.0
@@ -17,6 +17,7 @@ BuildRequires: ant-junit >= 1.6.2
BuildRequires: xerces-j2
BuildRequires: bcel >= 5.0
BuildRequires: java-devel >= 1.4.2
+BuildRequires: apache-ivy
Requires: java >= 1.4.2
Requires: junit >= 3.8.0
Requires: ant >= 1.6.2
@@ -37,31 +38,26 @@ Api documentation for %{name}.
%prep
%setup -q -n %{name}
-rm -rf test/src/net/sf/antcontrib/antclipse
-
-%patch0
+%patch0 -b .sav
%patch2
-sed -i "s/\r//" manual/tasks/foreach.html manual/tasks/for.html
+
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
+
+sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
+# needs porting to latest ivy
+rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
%build
-export JUNIT_VER=`rpm -q --queryformat='%%{version}' junit`
-mkdir -p test/lib
-(cd test/lib
-ln -s $(find-jar junit-$(JUNIT_VER)) junit-$(JUNIT_VER).jar
-)
-export OPT_JAR_LIST="ant/ant-junit junit"
-export CLASSPATH=
-CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH
-echo $ANT_HOME
-ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
+ant dist
%install
# jars
-install -Dpm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
+install -Dpm 644 target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
@@ -76,13 +72,16 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
%{_javadir}/ant/*.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
-%doc build/docs/LICENSE.txt
-%doc build/docs/tasks/*
+%doc target/docs/LICENSE.txt
+%doc target/docs/manual/tasks/*
%files javadoc
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Dec 15 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.15.b3
+- Update to beta 3.
+
* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.14.b2
- Fix pom installed name.
diff --git a/local-ivy.patch b/local-ivy.patch
new file mode 100644
index 0000000..a8627e7
--- /dev/null
+++ b/local-ivy.patch
@@ -0,0 +1,43 @@
+--- build.xml.sav 2006-11-02 18:44:02.000000000 +0200
++++ build.xml 2011-12-15 13:36:38.630460824 +0200
+@@ -20,22 +20,7 @@
+ <property name="dist.dir" location="dist" />
+ <property name="target.stage.dir" location="${target.dir}/stage" />
+
+- <target name="init">
+- <path id="ivy.lib.path">
+- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
+- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
+- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
+- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
+- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
+- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
+- </path>
+-
+- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
+- uri="antlib:fr.jayasoft.ivy.ant"
+- classpathref="ivy.lib.path"/>
+- </target>
+-
+- <target name="configure" depends="init">
++ <target name="configure" >
+ <ivy:configure file="ivy-conf.xml" />
+ </target>
+
+--- ivy-conf.xml.sav 2006-10-28 14:57:58.000000000 +0300
++++ ivy-conf.xml 2011-12-15 14:35:15.155840710 +0200
+@@ -5,11 +5,11 @@
+
+ <resolvers>
+ <filesystem name="local">
+- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
++ <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+
+- <ivyrep name="ivyrep" />
++ <ivyrep name="ivyrep" ivyroot="."/>
+
+ <chain name="default-resolver">
+ <resolver ref="local" />
diff --git a/sources b/sources
index d10ff97..f90fedb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66511dddcef3dc9798db33dbaca0d3de ant-contrib-1.0b2-src.tar.gz
+9e3d70fe9318af743262f3ddba4e9449 ant-contrib-1.0b3-src.tar.bz2
More information about the scm-commits
mailing list