Author: pawelz Date: Fri Apr 23 00:03:42 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-puretls:
java-puretls.spec (1.20 -> 1.21)
packages/java-regexp:
java-regexp.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: packages/java-puretls/java-puretls.spec
diff -u packages/java-puretls/java-puretls.spec:1.20
packages/java-puretls/java-puretls.spec:1.21
--- packages/java-puretls/java-puretls.spec:1.20 Sun Apr 12 15:50:36 2009
+++ packages/java-puretls/java-puretls.spec Fri Apr 23 02:03:33 2010
@@ -2,12 +2,6 @@
%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 puretls
@@ -26,10 +20,8 @@
BuildRequires: ant
BuildRequires: java-cryptix >= 3.2.0
BuildRequires: java-cryptix-asn1 = 0.20011119
-%{!?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: rpmbuild(macros) >= 1.300
BuildRequires: sed >= 4.0
%if %(locale -a | grep -q '^en_US$'; echo $?)
@@ -141,6 +133,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2010/04/23 00:03:33 pawelz
+- Don't force specific jdk.
+
Revision 1.20 2009/04/12 13:50:36 glen
- O/P for old name; rel 4
================================================================
Index: packages/java-regexp/java-regexp.spec
diff -u packages/java-regexp/java-regexp.spec:1.32
packages/java-regexp/java-regexp.spec:1.33
--- packages/java-regexp/java-regexp.spec:1.32 Wed Apr 8 20:18:41 2009
+++ packages/java-regexp/java-regexp.spec Fri Apr 23 02:03:37 2010
@@ -1,11 +1,5 @@
# $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 regexp
@@ -21,10 +15,8 @@
Patch0: jakarta-regexp-build.patch
URL: http://jakarta.apache.org/regexp/index.html
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
Requires: jre
@@ -113,6 +105,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2010/04/23 00:03:37 pawelz
+- Don't force specific jdk.
+
Revision 1.32 2009/04/08 18:18:41 pawelz
- P/O after rename
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-puretls/java-puretls.spec?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-regexp/java-regexp.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
