SPECS: httpunit.spec - add bcond for jtidy/nekohtml - cleanup deps...

[glen]

Author: glen                         Date: Sun Dec  9 02:36:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add bcond for jtidy/nekohtml
- cleanup deps and build

---- Files affected:
SPECS:
   httpunit.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/httpunit.spec
diff -u SPECS/httpunit.spec:1.8 SPECS/httpunit.spec:1.9
--- SPECS/httpunit.spec:1.8	Tue Nov 20 19:03:40 2007
+++ SPECS/httpunit.spec	Sun Dec  9 03:36:05 2007
@@ -1,6 +1,13 @@
 # $Revision$, $Date$
 # TODO
 # - disable tests that use network and $DISPLAY
+# NOTE:
+# As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
+#
+# Conditional build:
+%bcond_without	jtidy		# jtidy vs nekohtml
+#
+%include	/usr/lib/rpm/macros.java
 Summary:	Automated web site testing toolkit
 Summary(pl.UTF-8):	Zestaw narzędzi do automatycznego testowania serwisów WWW
 Name:		httpunit
@@ -16,24 +23,27 @@
 Patch2:		%{name}-servlettest.patch
 Patch3:		%{name}-java15.patch
 URL:		http://httpunit.sourceforge.net/
-# As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
 BuildRequires:	ant
-BuildRequires:	jaf >= 0:1.0.1
-BuildRequires:	jakarta-servletapi
+BuildRequires:	jaf >= 1.0.1
 BuildRequires:	javamail >= 0:1.2
-BuildRequires:	jtidy
-BuildRequires:	junit < 4.0
 BuildRequires:	junit >= 3.8
-# nekohtml broken
-#BuildRequires:	nekohtml
 BuildRequires:	rhino
+BuildRequires:	servlet >= 2.3
 BuildRequires:	unzip
+%if %{with jtidy}
+BuildRequires:	jtidy
+%else
+BuildRequires:	nekohtml
+%endif
 Requires:	jaxp_parser_impl
-Requires:	jtidy
 Requires:	junit >= 0:3.8
-#Requires:	nekohtml
 Requires:	rhino
-Requires:	servlet23
+Requires:	servlet >= 2.3
+%if %{with jtidy}
+Requires:	jtidy
+%else
+Requires:	nekohtml
+%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -95,20 +105,12 @@
 %patch2
 %patch3
 %{__unzip} -qd META-INF lib/httpunit.jar '*.dtd' # 1.6 dist zip is borked
-# remove all binary libs and javadocs
+
 find -name '*.jar' | xargs rm -v
 rm -rf doc/api
-ln -s \
-  %{_javadir}/junit.jar \
-  %{_javadir}/jtidy.jar \
-  %{_javadir}/nekohtml.jar \
-  %{_javadir}/servletapi4.jar \
-  %{_javadir}/js.jar \
-  %{_javadir}/xerces-j2.jar \
-  jars
 
 %build
-export CLASSPATH=$(build-classpath jaf javamail junit)
+export CLASSPATH=$(build-classpath jaf mail junit)
 %ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
   jar testjar examplesjar javadocs test servlettest
 
@@ -128,8 +130,6 @@
 rm -rf manual
 cp -a doc manual
 rm -rf manual/api
-# Fix link between manual and javadoc
-ln -sf %{_javadocdir}/%{name}-%{version} manual/api
 
 # Demo
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -168,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2007-12-09 02:36:05  glen
+- add bcond for jtidy/nekohtml
+- cleanup deps and build
+
 Revision 1.8  2007-11-20 18:03:40  glen
 - java deps; adapter
 
================================================================

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