- add todo

[packages/ant.git] / ant.spec

diff --git a/ant.spec b/ant.spec
index dc723c989753dbce15a4a9d2abbd6a5e0d6dc880..4b71874507fd5407af76dd73b2b62205c6fe4057 100644 (file)
--- a/ant.spec
+++ b/ant.spec
@@ -1,15 +1,18 @@
-# TODO: consider using external xerces-j
+# TODO
+# - consider using external xerces-j
+# - add lots of subpackages like here: http://www.jpackage.org/rpm.php?id=912 ?
 #
 # Conditional build:
-%bcond_with    basic_functionality       # generates package with only
-                                         # basic functionality, i.e. no deps
+%bcond_with    basic_functionality     # generates package with only
+                                       # basic functionality, i.e. no deps
+%bcond_without junit                   # build without (commonly used) junit support
 #
 Summary:       ant build tool for Java
 Summary(fr):   Outil de compilation pour java
 Summary(it):   Tool per la compilazione di programmi java
 Summary(pl):   ant - narzêdzie do budowania w Javie
 Name:          jakarta-ant
-Version:       1.6.3
+Version:       1.6.5
 %if %{with basic_functionality}
 Release:       0.basic.1
 %else
@@ -18,12 +21,14 @@ Release:    1
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
-# Source0-md5: fab56a0c0ab7bb2875e67c2a84b0a618
+# Source0-md5: 80a7ad191c40b7d8c82533524b282b6b
 Patch0:                %{name}-ANT_HOME.patch
 URL:           http://ant.apache.org/
 BuildRequires: jdk
+%{?with_junit:BuildRequires:   junit}
 %if %{without basic_functionality}
 BuildRequires: antlr
+BuildRequires: beanshell
 BuildRequires: bsf >= 2.3.0
 BuildRequires: jaf
 BuildRequires: jakarta-bcel
@@ -34,14 +39,15 @@ BuildRequires:      jakarta-oro >= 2.0.7
 BuildRequires: jakarta-regexp >= 1.3
 BuildRequires: javamail
 BuildRequires: jsch
-BuildRequires: junit
 BuildRequires: netrexx
 BuildRequires: xalan-j
 BuildRequires: rhino >= 1.5R3
 BuildRequires: xml-commons-resolver >= 1.1
+BuildRequires: rpm-pythonprov
 # TODO: icontract, jai, jdepend, starteam, stylebook, vaj, weblogic, xslp
 %endif
 Requires:      jdk
+%{?with_junit:Provides:        jakarta-ant(junit) = %{version}}
 Provides:      jaxp_parser_impl
 Provides:      xerces-j = 2.6.2
 Obsoletes:     xerces-j
@@ -85,8 +91,9 @@ w Javie.
 %patch0 -p1
 
 %build
-JAVA_HOME=%{_libdir}/java
-export JAVA_HOME
+export JAVA_HOME=%{_libdir}/java
+# the same is probably needed for all other optional packages
+%{?with_junit:export CLASSPATH=%{_javadir}/junit.jar}
 sh build.sh
 
 %install