Author: pawelz Date: Mon Apr 6 10:11:33 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- force java-sun (see TODO)
- fixed installation of examples
---- Files affected:
SPECS:
java-puretls.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/java-puretls.spec
diff -u SPECS/java-puretls.spec:1.14 SPECS/java-puretls.spec:1.15
--- SPECS/java-puretls.spec:1.14 Mon Apr 6 10:56:23 2009
+++ SPECS/java-puretls.spec Mon Apr 6 12:11:28 2009
@@ -1,12 +1,10 @@
# $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.
+
%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
@@ -24,7 +22,7 @@
BuildRequires: ant
BuildRequires: java-cryptix
BuildRequires: java-cryptix-asn1 = 0.20011119
-#BuildRequires: java-gnu-getopt
+BuildRequires: java-sun
BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: sed >= 4.0
@@ -33,6 +31,7 @@
%endif
Requires: cryptix
Requires: cryptix-asn1 = 0.20011119
+Requires: java-sun-jre
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,7 +90,7 @@
cp build/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
ln -sf %{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-cp build/%{srcname}demo.jar
$RPM_BUILD_ROOT%{_examplesdir}/%{name}/%{srcname}-demo.jar
+cp build/%{srcname}demo.jar
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/%{srcname}-demo.jar
cp *.pem $RPM_BUILD_ROOT%{_datadir}/%{srcname}
cp test.pl $RPM_BUILD_ROOT%{_datadir}/%{srcname}
@@ -128,6 +127,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2009/04/06 10:11:28 pawelz
+- force java-sun (see TODO)
+- fixed installation of examples
+
Revision 1.14 2009/04/06 08:56:23 pawelz
- disabled BR gnu-getopt
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-puretls.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
