Author: pawelz Date: Sun Apr 18 14:13:13 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- unify java APIs deps
---- Files affected:
packages/java-commons-fileupload:
java-commons-fileupload.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: packages/java-commons-fileupload/java-commons-fileupload.spec
diff -u packages/java-commons-fileupload/java-commons-fileupload.spec:1.33
packages/java-commons-fileupload/java-commons-fileupload.spec:1.34
--- packages/java-commons-fileupload/java-commons-fileupload.spec:1.33 Fri Aug
21 09:50:40 2009
+++ packages/java-commons-fileupload/java-commons-fileupload.spec Sun Apr
18 16:13:08 2010
@@ -5,11 +5,6 @@
#
# Conditional build:
%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
@@ -26,17 +21,16 @@
Patch0: %{name}-noget.patch
URL: http://commons.apache.org/fileupload/
BuildRequires: ant-junit >= 1.5
-BuildRequires: java(Portlet) = 1.0
-BuildRequires: java(Servlet) >= 2.4
+BuildRequires: java(portlet) = 1.0
+BuildRequires: java(servlet) >= 2.4
BuildRequires: java-commons-io
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
BuildRequires: java-junit >= 3.8.1
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
-Requires: java(Portlet) = 1.0
-Requires: java(Servlet) >= 2.4
+Requires: java(portlet) = 1.0
+Requires: java(servlet) >= 2.4
Requires: java-commons-io
Requires: jpackage-utils
Provides: jakarta-commons-fileupload
@@ -124,6 +118,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2010/04/18 14:13:08 pawelz
+- don't force specific jdk
+- unify java APIs deps
+
Revision 1.33 2009/08/21 07:50:40 pawelz
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-fileupload/java-commons-fileupload.spec?r1=1.33&r2=1.34&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
