OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 14-Dec-2008 19:47:40
Branch: HEAD Handle: 2008121418474000
Modified files:
openpkg-src/ant ant.spec
Log:
modifying package: ant-1.7.1 20081214 again
Summary:
Revision Changes Path
1.59 +16 -6 openpkg-src/ant/ant.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 ant.spec
--- openpkg-src/ant/ant.spec 14 Dec 2008 18:33:40 -0000 1.58
+++ openpkg-src/ant/ant.spec 14 Dec 2008 18:47:40 -0000 1.59
@@ -24,6 +24,7 @@
# package version
%define V_ant 1.7.1
%define V_ivy 2.0.0-rc2
+%define V_maven 2.0.9
%define V_junit 4.5
# package information
@@ -45,9 +46,10 @@
# list of sources
Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{V_ant}-bin.tar.bz2
Source1:
http://www.apache.org/dist/ant/ivy/%{V_ivy}/apache-ivy-%{V_ivy}-bin-with-deps.tar.gz
-Source2: http://switch.dl.sourceforge.net/junit/junit%{V_junit}.zip
-Source3: ant.conf
-Source4: rc.ant
+Source2:
http://www.apache.org/dist/maven/binaries/maven-ant-tasks-%{V_maven}.jar
+Source3: http://switch.dl.sourceforge.net/junit/junit%{V_junit}.zip
+Source4: ant.conf
+Source5: rc.ant
# build information
Prefix: %{l_prefix}
@@ -68,6 +70,11 @@
url = http://www.apache.org/dist/ant/binaries/
regex = apache-ant-(__VER__)-bin\.tar\.bz2
}
+ prog ant:maven-ant-tasks = {
+ version = %{V_maven}
+ url = http://www.apache.org/dist/maven/binaries/
+ regex = maven-ant-tasks-(__VER__)\.jar
+ }
prog ant:ivy = {
version = %{V_ivy}
url = http://www.apache.org/dist/ant/ivy/
@@ -108,7 +115,7 @@
%{l_shtool} install -c -m 644 \
apache-ivy-*/ivy-%{V_ivy}.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/ivy.jar
( cd apache-ivy-*/lib
- for jar in commons-cli-*.jar commons-codec-*.jar
commons-httpclient-*.jar commons-lang-*.jar \
+ for jar in commons-codec-*.jar commons-httpclient-*.jar \
commons-logging-*.jar commons-vfs-*.jar jsch-*.jar
oro-*.jar; do
newjar="ivy-`echo $jar | sed -e 's;-[0-9].*$;;'`.jar"
%{l_shtool} install -c -m 644 \
@@ -128,11 +135,14 @@
junit*/junit-%{V_junit}.jar
$RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/junit.jar
%{l_shtool} install -c -m 644 \
etc/*.xsl etc/checkstyle/*.xsl $RPM_BUILD_ROOT%{l_prefix}/etc/ant/
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE maven-ant-tasks-%{V_maven}.jar} \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/maven-ant-task.jar
%if "%{with_docs}" == "yes"
rm docs/LICENSE*
mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/
- %{l_shtool} install -m 644 welcome.html \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/docs/
+ %{l_shtool} install -c -m 644 \
+ welcome.html $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/docs/
%endif
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE ant.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/ant/
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
