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

[pawelz]

Author: pawelz                       Date: Sun Apr 18 14:03:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force specific jdk
- unify java api deps

---- Files affected:
packages/java-commons-chain:
   java-commons-chain.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/java-commons-chain/java-commons-chain.spec
diff -u packages/java-commons-chain/java-commons-chain.spec:1.12 packages/java-commons-chain/java-commons-chain.spec:1.13
--- packages/java-commons-chain/java-commons-chain.spec:1.12	Mon Nov 30 09:41:07 2009
+++ packages/java-commons-chain/java-commons-chain.spec	Sun Apr 18 16:03:24 2010
@@ -4,12 +4,6 @@
 %bcond_with	javadoc		# don't build javadoc
 %bcond_with	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		commons-chain
@@ -24,12 +18,11 @@
 Patch0:		%{name}-notests.patch
 URL:		http://commons.apache.org/chain
 BuildRequires:	ant
-BuildRequires:	java(JavaServerFaces) = 1.1
+BuildRequires:	java(javaserverfaces) = 1.1
 BuildRequires:	java-commons-digester >= 1.8
 BuildRequires:	java-commons-logging
 BuildRequires:	java-pluto
-%{!?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
@@ -40,10 +33,10 @@
 BuildRequires:	java-commons-collections
 BuildRequires:	java-junit
 %endif
-BuildRequires:	java(Servlet)
+BuildRequires:	java(servlet)
 BuildRequires:	sed >= 4
-Requires:	java(JavaServerFaces) = 1.1
-Requires:	java(Servlet)
+Requires:	java(javaserverfaces) = 1.1
+Requires:	java(servlet)
 Requires:	java-commons-digester >= 1.8
 Requires:	java-commons-logging
 Requires:	java-pluto
@@ -165,6 +158,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/04/18 14:03:24  pawelz
+- don't force specific jdk
+- unify java api deps
+
 Revision 1.12  2009/11/30 08:41:07  pawelz
 - Poldek seems to have problems with resolving java(Portlet) dependency.
   Replaced with java-pluto
================================================================

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