template-specs: java.spec - allow using alternate JDKs with %use_jdk and %b...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 19:08:44 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- allow using alternate JDKs with %use_jdk and %buildrequires_jdk

---- Files affected:
template-specs:
   java.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: template-specs/java.spec
diff -u template-specs/java.spec:1.46 template-specs/java.spec:1.47
--- template-specs/java.spec:1.46	Sun Apr 18 00:48:02 2010
+++ template-specs/java.spec	Sun Apr 18 21:08:37 2010
@@ -7,6 +7,10 @@
 
 %include	/usr/lib/rpm/macros.java
 
+# To force building with specific JDK implementation
+# without replacing currently installed /usr/bin/javac, etc.
+#%%define	use_jdk	java-gcj-compat
+
 # Name without java- prefix. If it is application, not a library,
 # just do s/srcname/name/g
 %define		srcname		-
@@ -26,7 +30,8 @@
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
-BuildRequires:	jdk
+# allows building with alternate JDK
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -205,6 +210,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2010/04/18 19:08:37  jajcus
+- allow using alternate JDKs with %use_jdk and %buildrequires_jdk
+
 Revision 1.46  2010/04/17 22:48:02  pawelz
 - we no longer want to force gcj for th
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/java.spec?r1=1.46&r2=1.47&f=u