Author: pawelz Date: Mon Apr 6 11:52:10 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- disable test that requires java-sun
- jdk bconds
- rel 2
---- Files affected:
SPECS:
java-puretls.spec (1.17 -> 1.18)
---- Diffs:
================================================================
Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.17 SPECS/java-puretls.spec:1.18
--- SPECS/java-puretls.spec:1.17 Mon Apr 6 12:40:14 2009
+++ SPECS/java-puretls.spec Mon Apr 6 13:52:05 2009
@@ -1,11 +1,13 @@
# $Revision$, $Date$
-# TODO:
-# - It uses sun's proprietari API provided by rt.jar from J2SE, so I have no
idea
-# how to build it using gcj.
-# note this warning: [javac]
/home/users/pawelz/rpm/BUILD.noarch-linux/puretls-0.9b5/src/COM/claymoresystems/provider/test/DSATest.java:51:
warning: sun.security.provider.DSAPublicKey is Sun proprietary API and may be
removed in a future release
%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
@@ -14,7 +16,7 @@
Summary(pl.UTF-8): Implementacja SSLv3 i TLSv1 w Javie
Name: java-puretls
Version: 0.9
-Release: 0.%{beta}.1
+Release: 0.%{beta}.2
License: BSD-like
Group: Libraries/Java
Source0: %{srcname}-%{version}%{beta}.tar.gz
@@ -23,8 +25,10 @@
BuildRequires: ant
BuildRequires: java-cryptix >= 3.2.0
BuildRequires: java-cryptix-asn1 = 0.20011119
-BuildRequires: java-sun
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
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 $?)
@@ -32,7 +36,6 @@
%endif
Requires: cryptix >= 3.2.0
Requires: cryptix-asn1 = 0.20011119
-Requires: java-sun-jre
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,6 +75,11 @@
xargs grep -l "/usr/local/bin/perl" | \
xargs sed -i -e "s|/usr/local/bin/perl|/usr/bin/perl|g;"
+# Disable test that uses proprietary SUN API
+%if %{without java_sun}
+mv src/COM/claymoresystems/provider/test/DSATest.java{,.disabled}
+%endif
+
%build
required_jars="cryptix cryptix-asn1"
CLASSPATH=$(build-classpath $required_jars)
@@ -128,6 +136,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2009/04/06 11:52:05 pawelz
+- disable test that requires java-sun
+- jdk bconds
+- rel 2
+
Revision 1.17 2009/04/06 10:40:14 pawelz
- one more %%install fix
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
