Author: pawelz Date: Sun Apr 18 15:58:48 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- updated java deps
---- Files affected:
packages/java-struts-legacy:
java-struts-legacy.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/java-struts-legacy/java-struts-legacy.spec
diff -u packages/java-struts-legacy/java-struts-legacy.spec:1.11
packages/java-struts-legacy/java-struts-legacy.spec:1.12
--- packages/java-struts-legacy/java-struts-legacy.spec:1.11 Tue May 19
08:30:47 2009
+++ packages/java-struts-legacy/java-struts-legacy.spec Sun Apr 18 17:58:42 2010
@@ -1,15 +1,8 @@
# $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
-
%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
@@ -21,19 +14,18 @@
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)
@@ -112,6 +104,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2010/04/18 15:58:42 pawelz
+- don't force specific jdk
+- updated java deps
+
Revision 1.11 2009/05/19 06:30:47 pawelz
- renamed from jakarta-struts-legacy
- unified java spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-struts-legacy/java-struts-legacy.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
