summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpawelz2010-04-18 15:58:42 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit8aba0e8ef80c0cf4b032acc990d0a3c026059e88 (patch)
treec6e496bd9d7dbb886ff1b43361e995435248f581
parent12e108cc6ec187ea7621f0061d83d0c946ec4c0f (diff)
downloadjava-struts-legacy-8aba0e8ef80c0cf4b032acc990d0a3c026059e88.zip
java-struts-legacy-8aba0e8ef80c0cf4b032acc990d0a3c026059e88.tar.gz
- don't force specific jdk
- updated java deps Changed files: java-struts-legacy.spec -> 1.12
-rw-r--r--java-struts-legacy.spec20
1 files changed, 6 insertions, 14 deletions
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)