packages: java-xom/java-xom.spec - don't force specific jdk

pawelz pawelz at pld-linux.org
Sun Apr 18 18:12:24 CEST 2010


Author: pawelz                       Date: Sun Apr 18 16:12:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk

---- Files affected:
packages/java-xom:
   java-xom.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/java-xom/java-xom.spec
diff -u packages/java-xom/java-xom.spec:1.4 packages/java-xom/java-xom.spec:1.5
--- packages/java-xom/java-xom.spec:1.4	Wed Jan 20 13:41:52 2010
+++ packages/java-xom/java-xom.spec	Sun Apr 18 18:12:18 2010
@@ -4,11 +4,6 @@
 %bcond_with	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
 #
-%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	xom
@@ -25,12 +20,10 @@
 # Source1-md5:	b598ae6b7e765a92e13667b0a80392f4
 Patch0:		%{name}-jaxen-build.patch
 URL:		http://www.cafeconleche.org/XOM/
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	java-xalan
 BuildRequires:	java-xerces
 BuildRequires:	java-xml-commons-external
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
 BuildRequires:	rpm-javaprov
@@ -150,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/18 16:12:18  pawelz
+- don't force specific jdk
+
 Revision 1.4  2010/01/20 12:41:52  pawelz
 - rel 1
 
================================================================

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



More information about the pld-cvs-commit mailing list