SPECS: httpunit.spec - inverted jtidy bcond (we prefer nekohtml) - BRs

[pawelz]

Author: pawelz                       Date: Fri Feb 27 18:03:53 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- inverted jtidy bcond (we prefer nekohtml)
- BRs

---- Files affected:
SPECS:
   httpunit.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/httpunit.spec
diff -u SPECS/httpunit.spec:1.10 SPECS/httpunit.spec:1.11
--- SPECS/httpunit.spec:1.10	Thu Feb 26 23:14:52 2009
+++ SPECS/httpunit.spec	Fri Feb 27 19:03:48 2009
@@ -1,11 +1,11 @@
 # $Revision$, $Date$
 # TODO
-# - disable tests that use network and $DISPLAY
+# - does not build with new servletapi.
 # NOTE:
 # As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
 #
 # Conditional build:
-%bcond_without	jtidy		# jtidy vs nekohtml
+%bcond_with	jtidy		# jtidy vs nekohtml
 #
 %include	/usr/lib/rpm/macros.java
 Summary:	Automated web site testing toolkit
@@ -26,25 +26,20 @@
 BuildRequires:	ant
 BuildRequires:	jaf >= 1.0.1
 BuildRequires:	java-gcj-compat-devel
+BuildRequires:	java-xerces >= 2.5
 BuildRequires:	javamail >= 0:1.2
+%{?with_jtidy:BuildRequires:	jtidy >= 1.0-0.20000804r7dev}
 BuildRequires:	junit >= 3.8
-BuildRequires:	rhino
-BuildRequires:	servlet >= 2.3
+%{?without_jtidy:BuildRequires:	nekohtml >= 0.9.1}
+BuildRequires:	rhino >= 1.5R4.1
+# BuildRequires:	servlet >= 2.3
 BuildRequires:	unzip
-%if %{with jtidy}
-BuildRequires:	jtidy
-%else
-BuildRequires:	nekohtml
-%endif
-Requires:	jaxp_parser_impl
+Requires:	java-xerces >= 2.5
+%{?with_jtidy:Requires:	jtidy >= 1.0-0.20000804r7dev}
 Requires:	junit >= 0:3.8
-Requires:	rhino
-Requires:	servlet >= 2.3
-%if %{with jtidy}
-Requires:	jtidy
-%else
-Requires:	nekohtml
-%endif
+%{?without_jtidy:Requires:	nekohtml >= 0.9.1}
+Requires:	rhino >= 1.5R4.1
+# Requires:	servlet >= 2.3
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -111,7 +106,14 @@
 rm -rf doc/api
 
 %build
-export CLASSPATH=$(build-classpath jaf mail junit)
+
+ln -s $(find-jar junit) jars/junit.jar
+#ln -s $(find-jar servlet) jars/servlet.jar
+ln -s $(find-jar xerces) jars/xerces.jar
+%{?with_jtidy:ln -s $(find-jar jtidy) jars/Tidy.jar}
+%{?without_jtidy:ln -s $(find-jar nekohtml) jars/nekohtml.jar}
+ln -s $(find-jar js) jars/js.jar
+
 %ant -Dbuild.compiler=extJavac -Dbuild.sysclasspath=last \
   jar testjar examplesjar javadocs test servlettest
 
@@ -171,6 +173,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/02/27 18:03:48  pawelz
+- inverted jtidy bcond (we prefer nekohtml)
+- BRs
+
 Revision 1.10  2009/02/26 22:14:52  pawelz
 - use java-gcj-compat-devel
 - manual and demo subpackages are in Documentaion group
================================================================

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