Author: pawelz Date: Fri Apr 23 00:02:14 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-commons-collections:
java-commons-collections.spec (1.31 -> 1.32)
packages/java-commons-daemon:
java-commons-daemon.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: packages/java-commons-collections/java-commons-collections.spec
diff -u packages/java-commons-collections/java-commons-collections.spec:1.31
packages/java-commons-collections/java-commons-collections.spec:1.32
--- packages/java-commons-collections/java-commons-collections.spec:1.31
Mon May 18 10:34:00 2009
+++ packages/java-commons-collections/java-commons-collections.spec Fri Apr
23 02:02:05 2010
@@ -2,12 +2,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-collections
@@ -24,10 +18,8 @@
Patch0: jakarta-commons-collections-target.patch
URL: http://commons.apache.org/collections/
BuildRequires: ant
-%{!?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
BuildRequires: sed >= 4.0
@@ -132,6 +124,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2010/04/23 00:02:05 pawelz
+- Don't force specific jdk.
+
Revision 1.31 2009/05/18 08:34:00 pawelz
- added JDK bconds
- simplified (-Dbuild.compiler and SHELL=/bin/sh hack are no longer needed)
================================================================
Index: packages/java-commons-daemon/java-commons-daemon.spec
diff -u packages/java-commons-daemon/java-commons-daemon.spec:1.27
packages/java-commons-daemon/java-commons-daemon.spec:1.28
--- packages/java-commons-daemon/java-commons-daemon.spec:1.27 Mon May 18
12:02:09 2009
+++ packages/java-commons-daemon/java-commons-daemon.spec Fri Apr 23
02:02:09 2010
@@ -1,12 +1,6 @@
# $Revision$, $Date$
# 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-daemon
@@ -23,11 +17,9 @@
URL: http://commons.apache.org/daemon/
BuildRequires: ant >= 1.4.1
BuildRequires: automake
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: junit >= 3.7
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xmlto >= 0:0.0.18-1
@@ -129,6 +121,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2010/04/23 00:02:09 pawelz
+- Don't force specific jdk.
+
Revision 1.27 2009/05/18 10:02:09 pawelz
- JDK bconds
- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-collections/java-commons-collections.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-daemon/java-commons-daemon.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
