packages: java-xml-commons-external/java-xml-commons-external.spec - do not...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:48:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not force gcj

---- Files affected:
packages/java-xml-commons-external:
   java-xml-commons-external.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/java-xml-commons-external/java-xml-commons-external.spec
diff -u packages/java-xml-commons-external/java-xml-commons-external.spec:1.11 packages/java-xml-commons-external/java-xml-commons-external.spec:1.12
--- packages/java-xml-commons-external/java-xml-commons-external.spec:1.11	Tue Mar 31 15:47:35 2009
+++ packages/java-xml-commons-external/java-xml-commons-external.spec	Sun Apr 18 10:48:35 2010
@@ -2,12 +2,6 @@
 # TODO
 # - something with org.apache.env.which (currently xml-commons-which.jar in
 #   xml-commons), then obsolete xml-commons here
-# Conditional build:
-%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
 #
@@ -26,8 +20,7 @@
 Source1:	%{srcname}-build.xml
 URL:		http://xml.apache.org/commons/
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
@@ -109,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/04/18 08:48:35  jajcus
+- do not force gcj
+
 Revision 1.11  2009/03/31 13:47:35  paszczus
 - it can also be build with java-sun so bcond java_sun added
 - release 5
================================================================

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