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

[pawelz]

Author: pawelz                       Date: Sun Apr 18 14:10:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- unified java APIs deps

---- Files affected:
packages/java-commons-el:
   java-commons-el.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/java-commons-el/java-commons-el.spec
diff -u packages/java-commons-el/java-commons-el.spec:1.17 packages/java-commons-el/java-commons-el.spec:1.18
--- packages/java-commons-el/java-commons-el.spec:1.17	Wed Aug 19 13:26:10 2009
+++ packages/java-commons-el/java-commons-el.spec	Sun Apr 18 16:10:25 2010
@@ -2,11 +2,6 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-%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
 
@@ -24,13 +19,11 @@
 Patch1:		commons-el-ant.patch
 URL:		http://commons.apache.org/el/
 BuildRequires:	ant
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java(jsp)
+BuildRequires:	java(servlet)
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils >= 0:1.6
-BuildRequires:	java(JSP)
-BuildRequires:	java(Servlet)
 BuildRequires:	junit
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
@@ -129,6 +122,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/04/18 14:10:25  pawelz
+- don't force specific jdk
+- unified java APIs deps
+
 Revision 1.17  2009/08/19 11:26:10  pawelz
 - check for find-jar errors
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-el/java-commons-el.spec?r1=1.17&r2=1.18&f=u