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

[pawelz]

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

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

---- Diffs:

================================================================
Index: packages/java-cos/java-cos.spec
diff -u packages/java-cos/java-cos.spec:1.4 packages/java-cos/java-cos.spec:1.5
--- packages/java-cos/java-cos.spec:1.4	Tue Feb  9 17:56:57 2010
+++ packages/java-cos/java-cos.spec	Sun Apr 18 16:21:03 2010
@@ -1,13 +1,5 @@
 # $Revision$, $Date$
-
-%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		cos
 Summary:	"must have" class library for servlet developers
 Summary(pl.UTF-8):	Niezbędnik programisty servletów
@@ -19,16 +11,14 @@
 Source0:	http://servlets.com/cos/cos-26Dec2008.zip
 # Source0-md5:	d7e6ee62b8e92c9d7cb0bdf016e2a815
 URL:		http://servlets.com/cos
-BuildRequires:	java(JSP)
-BuildRequires:	java(Servlet)
-%{!?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
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	java(JSP)
-Requires:	java(Servlet)
+Requires:	java(jsp)
+Requires:	java(servlet)
 Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -120,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/18 14:21:03  pawelz
+- don't force specific jdk
+- unified java deps
+
 Revision 1.4  2010/02/09 16:56:57  pawelz
 - rel 1
 
================================================================

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