Author: pawelz Date: Fri Apr 23 00:02:38 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-commons-net:
java-commons-net.spec (1.28 -> 1.29)
packages/java-commons-pool:
java-commons-pool.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: packages/java-commons-net/java-commons-net.spec
diff -u packages/java-commons-net/java-commons-net.spec:1.28
packages/java-commons-net/java-commons-net.spec:1.29
--- packages/java-commons-net/java-commons-net.spec:1.28 Mon Sep 21
13:24:59 2009
+++ packages/java-commons-net/java-commons-net.spec Fri Apr 23 02:02:29 2010
@@ -6,12 +6,6 @@
%bcond_with tests # tests are broken. see note above.
%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 commons-net
Summary: Commons Net - utility functions and components
@@ -27,13 +21,11 @@
URL: http://commons.apache.org/net/
BuildRequires: ant
%{?with_tests:BuildRequires: ant-junit}
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{!?with_java_sun:BuildRequires: java-gnu-classpath}
BuildRequires: java-oro >= 2.0.8
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
%{?with_tests:BuildRequires: junit}
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-oro >= 2.0.8
Provides: jakarta-commons-net
@@ -141,6 +133,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2010/04/23 00:02:29 pawelz
+- Don't force specific jdk.
+
Revision 1.28 2009/09/21 11:24:59 glen
- disable tests in sane way
================================================================
Index: packages/java-commons-pool/java-commons-pool.spec
diff -u packages/java-commons-pool/java-commons-pool.spec:1.32
packages/java-commons-pool/java-commons-pool.spec:1.33
--- packages/java-commons-pool/java-commons-pool.spec:1.32 Fri Dec 4
15:46:02 2009
+++ packages/java-commons-pool/java-commons-pool.spec Fri Apr 23 02:02:33 2010
@@ -2,12 +2,6 @@
#
# Conditional build:
%bcond_with 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 commons-pool
@@ -24,10 +18,8 @@
URL: http://commons.apache.org/pool/
BuildRequires: ant
BuildRequires: java-commons-collections >= 1.0
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-collections >= 1.0
@@ -130,6 +122,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2010/04/23 00:02:33 pawelz
+- Don't force specific jdk.
+
Revision 1.32 2009/12/04 14:46:02 pawelz
- don't build javadocs by default. It requires network access.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-net/java-commons-net.spec?r1=1.28&r2=1.29&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-pool/java-commons-pool.spec?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
