packages: java-httpunit/java-httpunit.spec - don't force gcj - updated deps...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 14:54:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force gcj
- updated deps
- unified sf Source0

---- Files affected:
packages/java-httpunit:
   java-httpunit.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/java-httpunit/java-httpunit.spec
diff -u packages/java-httpunit/java-httpunit.spec:1.15 packages/java-httpunit/java-httpunit.spec:1.16
--- packages/java-httpunit/java-httpunit.spec:1.15	Fri Jan 15 21:29:12 2010
+++ packages/java-httpunit/java-httpunit.spec	Sun Apr 18 16:54:29 2010
@@ -8,13 +8,7 @@
 %bcond_with	jtidy		# jtidy vs nekohtml
 %bcond_with	tests		# perform tests (seems to be broken)
 %bcond_without	javadoc		# perform tests (seems to be broken)
-#
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
-#
+
 %include	/usr/lib/rpm/macros.java
 #
 %define		srcname		httpunit
@@ -26,30 +20,30 @@
 Epoch:		0
 License:	MIT
 Group:		Libraries/Java
-Source0:	http://dl.sourceforge.net/httpunit/%{srcname}-%{version}.zip
+Source0:	http://downloads.sourceforge.net/httpunit/%{srcname}-%{version}.zip
 # Source0-md5:	e94b53b9f4d7bdb706e4baac95b6e424
 Patch0:		%{srcname}.build.patch
 Patch1:		%{srcname}-JavaScript-NotAFunctionException.patch
 Patch2:		%{srcname}-servlettest.patch
 Patch3:		%{srcname}-java15.patch
 URL:		http://httpunit.sourceforge.net/
+# BuildRequires:	java(servlet) >= 2.3
 BuildRequires:	ant
-BuildRequires:	jaf >= 1.0.1
-BuildRequires:	java-gcj-compat-devel
+BuildRequires:	java(jaf) >= 1.0.1
+BuildRequires:	java(javamail) >= 0:1.2
+BuildRequires:	java-rhino >= 1.5R4.1
 BuildRequires:	java-xerces >= 2.5
-BuildRequires:	javamail >= 0:1.2
+BuildRequires:	jdk
 %{?with_jtidy:BuildRequires:	jtidy >= 1.0-0.20000804r7dev}
 BuildRequires:	junit >= 3.8
 %{!?with_jtidy:BuildRequires:	nekohtml >= 0.9.1}
-BuildRequires:	rhino >= 1.5R4.1
-# BuildRequires:	servlet >= 2.3
 BuildRequires:	unzip
+# Requires:	java(servlet) >= 2.3
 Requires:	java-junit >= 0:3.8
+Requires:	java-rhino >= 1.5R4.1
 Requires:	java-xerces >= 2.5
 %{?with_jtidy:Requires:	jtidy >= 1.0-0.20000804r7dev}
 %{!?with_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)
 
@@ -196,6 +190,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2010/04/18 14:54:29  pawelz
+- don't force gcj
+- updated deps
+- unified sf Source0
+
 Revision 1.15  2010/01/15 20:29:12  sparky
 - don't use %{?without_...} - it may not work after inverting bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-httpunit/java-httpunit.spec?r1=1.15&r2=1.16&f=u