OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 02-Feb-2004 17:00:49
Branch: HEAD Handle: 2004020216004305
Modified files:
openpkg-re/vcheck vc.j2se
openpkg-src/j2se j2se.spec
openpkg-web news.txt
Log:
added optional Java Secure Socket Extension (JSSE) support; use shtool
instead of cp
Summary:
Revision Changes Path
1.2 +6 -1 openpkg-re/vcheck/vc.j2se
1.40 +19 -2 openpkg-src/j2se/j2se.spec
1.8409 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.j2se
============================================================================
$ cvs diff -u -r1.1 -r1.2 vc.j2se
--- openpkg-re/vcheck/vc.j2se 30 Jan 2004 20:31:00 -0000 1.1
+++ openpkg-re/vcheck/vc.j2se 2 Feb 2004 16:00:43 -0000 1.2
@@ -4,6 +4,11 @@
prog j2se = {
version = 1.3.1_10
url = http://java.sun.com/j2se/1.3/download.html
- regex = "Java 2 SDK, Standard Edition, v (1.3.1_\\d+)"
+ regex = "Java 2 SDK, Standard Edition, v (1\\.3\\.1_\\d+)"
+}
+prog j2se::jsse = {
+ version = 1.0.3_02
+ url = http://java.sun.com/products/jsse/index-103.html
+ regex = "JSSE (1\\.0\\.3_\\d+)"
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 j2se.spec
--- openpkg-src/j2se/j2se.spec 30 Jan 2004 20:31:03 -0000 1.39
+++ openpkg-src/j2se/j2se.spec 2 Feb 2004 16:00:48 -0000 1.40
@@ -31,6 +31,8 @@
%define V_lnx_fsys 1.3.1_10
%define V_bsd_dist 1.3.1p8_2
%define V_bsd_fsys 1.3.1
+%define V_jsse_dist 1_0_3_02
+%define V_jsse_fsys 1.0.3_02
# package information
Name: j2se
@@ -42,10 +44,11 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20040130
+Release: 20040202
# package options
%option with_native yes
+%option with_jsse no
# list of sources
Source0: http://java.sun.com/j2se/::/j2sdk-%{V_sol_dist}-solaris-sparc.sh
@@ -53,15 +56,20 @@
Source2: http://java.sun.com/j2se/::/jdk-%{V_bsd_dist}.tgz
Source3: rc.j2se
Source4: j2se.patch
+Source5: http://java.sun.com/products/jsse/::/jsse-%{V_jsse_dist}-gl.zip
%NoSource 0
%NoSource 1
%NoSource 2
+%NoSource 5
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20031117
PreReq: OpenPKG, openpkg >= 20031117
+%if "%{with_jsse}" == "yes"
+BuildPreReq: infozip
+%endif
AutoReq: no
AutoReqProv: no
Provides: JDK, JRE
@@ -128,7 +136,8 @@
# post-adjustments to installation area
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
- cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
+ %{l_shtool} install -c -m 644 \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true
@@ -145,6 +154,14 @@
# install run-command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.j2se} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+%if "%{with_jsse}" == "yes"
+ # install optional Java Secure Socket Extension (JSSE)
+ %{l_prefix}/bin/unzip %{SOURCE jsse-%{V_jsse_dist}-gl.zip}
+ %{l_shtool} install -c -m 644 \
+ jsse%{V_jsse_fsys}/lib/*.jar \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/lib/
+%endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8408 -r1.8409 news.txt
--- openpkg-web/news.txt 2 Feb 2004 11:54:05 -0000 1.8408
+++ openpkg-web/news.txt 2 Feb 2004 16:00:45 -0000 1.8409
@@ -1,3 +1,4 @@
+02-Feb-2004: Upgraded package: P<j2se-1.3.1-20040202>
02-Feb-2004: Upgraded package: P<tsmc-5.1.6.2-20040202>
02-Feb-2004: Upgraded package: P<subversion-0.37.0-20040202>
02-Feb-2004: Upgraded package: P<vim-6.2.222-20040202>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
