SPECS: httpunit.spec - does not compile with newer junit

[glen]

Author: glen                         Date: Sun Nov 18 17:24:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- does not compile with newer junit

---- Files affected:
SPECS:
   httpunit.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/httpunit.spec
diff -u SPECS/httpunit.spec:1.5 SPECS/httpunit.spec:1.6
--- SPECS/httpunit.spec:1.5	Tue Feb 13 09:06:35 2007
+++ SPECS/httpunit.spec	Sun Nov 18 18:24:02 2007
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - disable tests that use network and $DISPLAY
 Summary:	Automated web site testing toolkit
 Summary(pl.UTF-8):	Zestaw narzędzi do automatycznego testowania serwisów WWW
 Name:		httpunit
@@ -19,7 +21,8 @@
 BuildRequires:	jakarta-servletapi
 BuildRequires:	javamail >= 0:1.2
 BuildRequires:	jtidy
-BuildRequires:	junit >= 0:3.8
+BuildRequires:	junit >= 3.8
+BuildRequires:	junit < 4.0
 # nekohtml broken
 #BuildRequires:	nekohtml
 BuildRequires:	rhino
@@ -89,9 +92,9 @@
 %patch1
 %patch2
 %patch3
-%{__unzip} -qd META-INF lib/httpunit.jar "*.dtd" # 1.6 dist zip is borked
+%{__unzip} -qd META-INF lib/httpunit.jar '*.dtd' # 1.6 dist zip is borked
 # remove all binary libs and javadocs
-find . -name "*.jar" -exec rm -f {} \;
+find -name '*.jar' | xargs rm -v
 rm -rf doc/api
 ln -s \
   %{_javadir}/junit.jar \
@@ -103,8 +106,8 @@
   jars
 
 %build
-export CLASSPATH=$(build-classpath jaf javamail)
-ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
+export CLASSPATH=$(build-classpath jaf javamail junit)
+%ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
   jar testjar examplesjar javadocs test servlettest
 
 %install
@@ -172,7 +175,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.5  2007-02-13 08:06:35  glen
+Revision 1.6  2007-11-18 17:24:02  glen
+- does not compile with newer junit
+
+Revision 1.5  2007/02/13 08:06:35  glen
 - tabs in preamble
 
 Revision 1.4  2007/02/12 01:06:41  baggins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/httpunit.spec?r1=1.5&r2=1.6&f=u