Author: pawelz Date: Fri Apr 23 00:02:46 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-cryptix-asn1:
java-cryptix-asn1.spec (1.17 -> 1.18)
packages/java-cryptix:
java-cryptix.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/java-cryptix-asn1/java-cryptix-asn1.spec
diff -u packages/java-cryptix-asn1/java-cryptix-asn1.spec:1.17
packages/java-cryptix-asn1/java-cryptix-asn1.spec:1.18
--- packages/java-cryptix-asn1/java-cryptix-asn1.spec:1.17 Sun Apr 12
15:52:19 2009
+++ packages/java-cryptix-asn1/java-cryptix-asn1.spec Fri Apr 23 02:02:37 2010
@@ -1,11 +1,5 @@
# $Revision$, $Date$
%bcond_without javadoc # build api docs
-%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 snap 20011119
@@ -26,10 +20,8 @@
Patch0: %{srcname}-java-1.5.patch
BuildRequires: ant >= 1.5
BuildRequires: java-cryptix
-%{!?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
Requires: java-cryptix
Provides: cryptix-asn1
@@ -105,6 +97,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2010/04/23 00:02:37 pawelz
+- Don't force specific jdk.
+
Revision 1.17 2009/04/12 13:52:19 glen
- O/P for old name; rel 2
================================================================
Index: packages/java-cryptix/java-cryptix.spec
diff -u packages/java-cryptix/java-cryptix.spec:1.16
packages/java-cryptix/java-cryptix.spec:1.17
--- packages/java-cryptix/java-cryptix.spec:1.16 Mon Apr 6 12:22:43 2009
+++ packages/java-cryptix/java-cryptix.spec Fri Apr 23 02:02:41 2010
@@ -1,11 +1,5 @@
# $Revision$, $Date$
%bcond_without javadoc # build api docs
-%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 snapshot 20001002
@@ -23,8 +17,7 @@
Patch0: %{srcname}-java-1.5.patch
URL: http://www.cryptix.org/
BuildRequires: ant >= 1.5
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: unzip
@@ -106,6 +99,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2010/04/23 00:02:41 pawelz
+- Don't force specific jdk.
+
Revision 1.16 2009/04/06 10:22:43 pawelz
- dropped P: jce (java-sun provides different JCE api (???))
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-cryptix-asn1/java-cryptix-asn1.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-cryptix/java-cryptix.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
