packages: java-xmlunit/java-xmlunit.spec - drop gcj support. It does not pa...

[pawelz]

Author: pawelz                       Date: Thu Apr  1 17:59:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop gcj support. It does not pass tests on gcj/gij.

---- Files affected:
packages/java-xmlunit:
   java-xmlunit.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/java-xmlunit/java-xmlunit.spec
diff -u packages/java-xmlunit/java-xmlunit.spec:1.12 packages/java-xmlunit/java-xmlunit.spec:1.13
--- packages/java-xmlunit/java-xmlunit.spec:1.12	Thu Apr  1 17:57:48 2010
+++ packages/java-xmlunit/java-xmlunit.spec	Thu Apr  1 19:59:46 2010
@@ -1,18 +1,13 @@
 # $Revision$, $Date$
-# TODO
+# TODO:
 # - docs are broken. html docs seem to be incompatibile with our
 #   docbook-style-xsl. Does it require earlier version? pdf docs require
 #   dblatex command. I have no idea what it is and what should provide it.
 
-%bcond_with	doc		# build docs. Does not work.
+# NOTES:
+# - I'm forcing java_sun because it does not pass test_Transform on gcj.
 
-%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
+%bcond_with	doc		# build docs. Does not work.
 
 %define		srcname	xmlunit
 Summary:	XMLUnit - extend JUnit and NUnit to enable unit testing of XML
@@ -28,17 +23,17 @@
 BuildRequires:	ant >= 1.5
 BuildRequires:	ant-junit
 BuildRequires:	ant-trax
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java-sun
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jaxp_transform_impl
 BuildRequires:	jpackage-utils
-BuildRequires:	junit
+BuildRequires:	java-junit
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jaxp_parser_impl
 Requires:	jaxp_transform_impl
-Requires:	junit
+Requires:	java-junit
+Conflicts:	java-gcj-compat
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -118,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/04/01 17:59:46  pawelz
+- drop gcj support. It does not pass tests on gcj/gij.
+
 Revision 1.12  2010/04/01 15:57:48  pawelz
 - BR: ant-trax
 
================================================================

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