OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Oct-2006 12:37:37
Branch: HEAD Handle: 2006101511373700
Modified files:
openpkg-src/ant ant.spec
Log:
add JUnit to Ant based on code parts taken over from Michael Schloh
Summary:
Revision Changes Path
1.38 +19 -10 openpkg-src/ant/ant.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 ant.spec
--- openpkg-src/ant/ant.spec 13 Oct 2006 17:26:44 -0000 1.37
+++ openpkg-src/ant/ant.spec 15 Oct 2006 10:37:37 -0000 1.38
@@ -23,8 +23,8 @@
##
# package version
-%define V_real 1.6.5
-%define V_opkg 1.6.5
+%define V_ant 1.6.5
+%define V_junit 4.1
# package information
Name: ant
@@ -36,21 +36,22 @@
Class: EVAL
Group: Building
License: Apache Software License
-Version: %{V_opkg}
-Release: 20061013
+Version: %{V_ant}
+Release: 20061015
# package options
%option with_docs no
# list of sources
-Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{V_real}-bin.tar.bz2
-Source1: ant.conf
-Source2: rc.ant
+Source0:
http://www.apache.org/dist/ant/binaries/apache-ant-%{V_ant}-bin.tar.bz2
+Source1: http://switch.dl.sourceforge.net/junit/junit%{V_junit}.zip
+Source2: ant.conf
+Source3: rc.ant
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: OpenPKG, openpkg >= 20060823, infozip
PreReq: OpenPKG, openpkg >= 20060823, JRE
AutoReq: no
AutoReqProv: no
@@ -61,13 +62,19 @@
%track
prog ant = {
- version = %{version}
+ version = %{V_ant}
url = http://www.apache.org/dist/ant/binaries/
regex = apache-ant-(__VER__)-bin\.tar\.bz2
}
+ prog ant:junit = {
+ version = %{V_junit}
+ url = http://prdownloads.sourceforge.net/junit/
+ regex = junit(\d+\.\d+)\.zip
+ }
%prep
- %setup -q -n apache-ant-%{V_real}
+ %setup -q -n apache-ant-%{V_ant}
+ %{l_prefix}/bin/unzip -q %{SOURCE junit%{V_junit}.zip}
%build
# Note that there is nothing to build since the Ant binary distribution
@@ -91,6 +98,8 @@
%{l_shtool} install -c -m 644 \
lib/*.jar etc/*.jar $RPM_BUILD_ROOT%{l_prefix}/libexec/ant/lib/
%{l_shtool} install -c -m 644 \
+ 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/
%if "%{with_docs}" == "yes"
rm docs/LICENSE*
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
