[ant-contrib] Add maven pom and depmap.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Jan 14 20:22:38 UTC 2011
commit 8872adf722dc20e406224e429430b864b4adfe34
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Jan 14 22:21:34 2011 +0200
Add maven pom and depmap.
ant-contrib-1.0b2.pom | 23 +++++++++++++++++++++++
ant-contrib.spec | 33 +++++++++++++++++++++------------
2 files changed, 44 insertions(+), 12 deletions(-)
---
diff --git a/ant-contrib-1.0b2.pom b/ant-contrib-1.0b2.pom
new file mode 100644
index 0000000..6ec867e
--- /dev/null
+++ b/ant-contrib-1.0b2.pom
@@ -0,0 +1,23 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <packaging>jar</packaging>
+ <name>Ant-Contrib Tasks</name>
+ <version>1.0b2</version>
+ <url>http://ant-contrib.sourceforge.net</url>
+ <licenses>
+ <url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
+ </licenses>
+ <scm>
+ <url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
+ </scm>
+ <description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/ant-contrib.spec b/ant-contrib.spec
index 341edf1..bd6237a 100644
--- a/ant-contrib.spec
+++ b/ant-contrib.spec
@@ -1,19 +1,19 @@
-%define beta_number b2
+%global beta_number b2
Summary: Collection of tasks for Ant
Name: ant-contrib
Version: 1.0
-Release: 0.10.%{beta_number}%{?dist}
+Release: 0.11.%{beta_number}%{?dist}
License: ASL 2.0
URL: http://ant-contrib.sourceforge.net/
Group: Development/Libraries
-Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}%{beta_number}-src.tar.gz
+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
Patch2: ant-contrib-antservertest.patch
BuildRequires: jpackage-utils >= 1.5
BuildRequires: junit >= 3.8.0
BuildRequires: ant-junit >= 1.6.2
-BuildRequires: ant-nodeps >= 1.6.2
BuildRequires: xerces-j2
BuildRequires: bcel >= 5.0
BuildRequires: java-devel >= 1.4.2
@@ -21,7 +21,6 @@ Requires: java >= 1.4.2
Requires: junit >= 3.8.0
Requires: ant >= 1.6.2
Requires: xerces-j2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%description
@@ -50,7 +49,7 @@ 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 ant/ant-nodeps"
+export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=
CLASSPATH=build/lib/ant-contrib-%{version}.jar:$CLASSPATH
echo $ANT_HOME
@@ -60,26 +59,33 @@ ant -Dsource=1.4 -Dversion=%{version} -Dbcel.jar=file://%{_javadir}/bcel.jar all
rm -rf $RPM_BUILD_ROOT
# jars
-install -Dpm 644 build/lib/%{name}.jar \
- $RPM_BUILD_ROOT%{_javadir}/ant/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
+install -Dpm 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
# javadoc
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf build/docs/api
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
-%clean
-rm -rf $RPM_BUILD_ROOT
+%add_to_maven_depmap %{name} %{name} %{version} JPP/ant %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
%files
%defattr(-,root,root,-)
%{_sysconfdir}/ant.d/ant-contrib
%{_javadir}/ant/*.jar
+%{_mavenpomdir}/*
+%{_mavendepmapdir}
%doc build/docs/LICENSE.txt
%doc build/docs/tasks/*
@@ -91,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Fri Jan 14 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.11.b2
+- Add maven pom and depmap.
+
* Fri Sep 4 2009 Alexander Kurtakov <akurtako at redhat.com> 1.0-0.10.b2
- Install ant contrib in ant.d.
More information about the scm-commits
mailing list