SPECS: java-commons-io.spec - added bcond tests - BRs

[pawelz]

Author: pawelz                       Date: Mon Feb  9 21:11:14 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond tests
- BRs

---- Files affected:
SPECS:
   java-commons-io.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/java-commons-io.spec
diff -u SPECS/java-commons-io.spec:1.11 SPECS/java-commons-io.spec:1.12
--- SPECS/java-commons-io.spec:1.11	Mon Feb  9 20:40:59 2009
+++ SPECS/java-commons-io.spec	Mon Feb  9 22:11:09 2009
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%bcond_with	tests		# run tests (takes long time)
 
 %include	/usr/lib/rpm/macros.java
 Summary:	Commons IO component for Java servlets
@@ -14,11 +15,11 @@
 Source0:	http://www.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 # Source0-md5:	24b228f2d0c40ffed9204cdab015bccf
 URL:		http://commons.apache.org/io/
-BuildRequires:	ant-junit >= 1.5
+BuildRequires:	ant
+%{?with_tests:BuildRequires:	ant-junit >= 1.5}
 BuildRequires:	java-gcj-compat-devel
-BuildRequires:	java-servletapi
 BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 3.8.1
+%{?with_tests:BuildRequires:	junit >= 3.8.1}
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -57,9 +58,14 @@
 
 %build
 # for tests
-CLASSPATH=$(build-classpath servlet junit)
+export SHELL=/bin/sh
 %ant -Dbuild.compiler=extJavac jar %{?with_javadoc:javadoc}
 
+%if %{with tests}
+JUNITJAR=$(find-jar junit)
+%ant -Djunit.jar=$JUNITJAR test
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
@@ -97,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/02/09 21:11:09  pawelz
+- added bcond tests
+- BRs
+
 Revision 1.11  2009/02/09 19:40:59  pawelz
 - dependencies
 - use java-gcj for build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-io.spec?r1=1.11&r2=1.12&f=u