Author: pawelz Date: Fri Apr 23 00:02:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-commons-dbcp:
java-commons-dbcp.spec (1.31 -> 1.32)
packages/java-commons-digester:
java-commons-digester.spec (1.31 -> 1.32)
---- Diffs:
================================================================
Index: packages/java-commons-dbcp/java-commons-dbcp.spec
diff -u packages/java-commons-dbcp/java-commons-dbcp.spec:1.31
packages/java-commons-dbcp/java-commons-dbcp.spec:1.32
--- packages/java-commons-dbcp/java-commons-dbcp.spec:1.31 Mon May 18
12:57:06 2009
+++ packages/java-commons-dbcp/java-commons-dbcp.spec Fri Apr 23 02:02:13 2010
@@ -4,12 +4,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
%define srcname commons-dbcp
@@ -31,11 +25,9 @@
BuildRequires: java-commons-collections-tomcat5
BuildRequires: java-commons-pool >= 1.2
BuildRequires: java-commons-pool-tomcat5
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: java-xerces
BuildRequires: jpackage-utils
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-collections
@@ -171,6 +163,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2010/04/23 00:02:13 pawelz
+- Don't force specific jdk.
+
Revision 1.31 2009/05/18 10:57:06 pawelz
- Apply patch0. It is realy needed for java >= 1.6
================================================================
Index: packages/java-commons-digester/java-commons-digester.spec
diff -u packages/java-commons-digester/java-commons-digester.spec:1.31
packages/java-commons-digester/java-commons-digester.spec:1.32
--- packages/java-commons-digester/java-commons-digester.spec:1.31 Fri Apr
10 11:27:14 2009
+++ packages/java-commons-digester/java-commons-digester.spec Fri Apr 23
02:02:17 2010
@@ -4,12 +4,6 @@
%bcond_without javadoc # don't build javadoc
%bcond_with java_sun # build with java-sun
-%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-digester
@@ -28,11 +22,9 @@
BuildRequires: java-commons-beanutils
BuildRequires: java-commons-collections
BuildRequires: java-commons-logging
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: junit
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-beanutils
@@ -125,6 +117,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2010/04/23 00:02:17 pawelz
+- Don't force specific jdk.
+
Revision 1.31 2009/04/10 09:27:14 pawelz
- BR: ant-junit
- BR: junit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-dbcp/java-commons-dbcp.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-digester/java-commons-digester.spec?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
