From 8aba0e8ef80c0cf4b032acc990d0a3c026059e88 Mon Sep 17 00:00:00 2001
From: pawelz
Date: Sun, 18 Apr 2010 15:58:42 +0000
Subject: - don't force specific jdk - updated java deps

Changed files:
    java-struts-legacy.spec -> 1.12
diff --git a/java-struts-legacy.spec b/java-struts-legacy.spec
index de1a9ee..bf915fa 100644
--- a/java-struts-legacy.spec
+++ b/java-struts-legacy.spec
@@ -1,14 +1,7 @@
 %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
-
 %define         srcname         struts-legacy
-
 Summary:	struts-legacy - classes removed from the core Struts distribution
 Summary(pl.UTF-8):	struts-legacy - klasy usunięte z głównej dystrybucji Struts
 Name:		java-struts-legacy
@@ -20,19 +13,18 @@ Source0:	http://archive.apache.org/dist/jakarta/struts/struts-legacy/struts-lega
 Group:		Libraries/Java
 URL:		http://struts.apache.org/
 BuildRequires:	ant >= 1.6
+BuildRequires:	java(jdbc-stdext) >= 2.0-2
+BuildRequires:	java(servlet)
 BuildRequires:	java-commons-beanutils
 BuildRequires:	java-commons-collections
-%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
-BuildRequires:	jdbc-stdext >= 2.0-2
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:  rpm >= 4.4.9-56
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	servlet
+Requires:	java(jdbc-stdext) >= 2.0
+Requires:	java(servlet)
 Requires:	java-commons-beanutils
 Requires:	java-commons-collections
-Requires:	jdbc-stdext >= 2.0
-Requires:	servlet
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-- 
cgit v0.10.2