packages: java-struts/java-struts.spec - dropped unused jdk bconds - update...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 15:57:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped unused jdk bconds
- updated deps

---- Files affected:
packages/java-struts:
   java-struts.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/java-struts/java-struts.spec
diff -u packages/java-struts/java-struts.spec:1.28 packages/java-struts/java-struts.spec:1.29
--- packages/java-struts/java-struts.spec:1.28	Wed May 20 13:22:46 2009
+++ packages/java-struts/java-struts.spec	Sun Apr 18 17:57:51 2010
@@ -1,11 +1,4 @@
 # $Revision$, $Date$
-%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
 
 Summary:	Web application framework
@@ -26,6 +19,7 @@
 #BuildRequires:	antlr >= 2.7.2
 BuildRequires:	bsf
 #BuildRequires:	jakarta-oro >= 2.0.7
+BuildRequires:	java(jdbc-stdext) >= 2.0-2
 #BuildRequires:	java-commons-beanutils >= 1.6.1
 #BuildRequires:	java-commons-collections
 #BuildRequires:	java-commons-digester >= 1.5
@@ -33,14 +27,14 @@
 #BuildRequires:	java-commons-lang
 #BuildRequires:	java-commons-logging >= 1.0.3
 #BuildRequires:	java-commons-validator >= 1.1.0
-BuildRequires:	jdbc-stdext >= 2.0-2
 #BuildRequires:	jpackage-utils
 BuildRequires:	maven >= 2
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 #BuildRequires:	servlet5
-Requires:	jakarta-oro
+Requires:	java(jdbc-stdext) >= 2.0
+Requires:	java(servlet)
 Requires:	java-commons-beanutils
 Requires:	java-commons-collections
 Requires:	java-commons-digester
@@ -48,8 +42,7 @@
 Requires:	java-commons-lang
 Requires:	java-commons-logging >= 1.0.3
 Requires:	java-commons-validator
-Requires:	jdbc-stdext >= 2.0
-Requires:	servlet
+Requires:	java-oro
 Obsoletes:	jakarta-struts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -281,6 +274,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/04/18 15:57:51  pawelz
+- dropped unused jdk bconds
+- updated deps
+
 Revision 1.28  2009/05/20 11:22:46  pawelz
 - rpm-related BRs
 
================================================================

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