OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 26-Sep-2003 19:53:15
Branch: HEAD Handle: 2003092618531301
Modified files:
openpkg-src/j2se14 j2se14.spec
openpkg-web news.txt
Log:
Correct and align flaky platform definitions, update sources from
1_4_2 to 1_4_2_01, add Solaris x86 target, add HtmlConverter binary
(for using the Java Plugin in HTML pages), and fix broken manpage
installation logic
Summary:
Revision Changes Path
1.25 +35 -25 openpkg-src/j2se14/j2se14.spec
1.6749 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se14/j2se14.spec
============================================================================
$ cvs diff -u -r1.24 -r1.25 j2se14.spec
--- openpkg-src/j2se14/j2se14.spec 25 Sep 2003 18:26:26 -0000 1.24
+++ openpkg-src/j2se14/j2se14.spec 26 Sep 2003 17:53:14 -0000 1.25
@@ -24,9 +24,9 @@
##
# package versions
-%define V_sunjava 1_4_2
-%define V_filesys 1.4.2
-%define V_openpkg 1.4.2
+%define V_sunjava 1_4_2_01
+%define V_filesys 1.4.2_01
+%define V_openpkg 1.4.2.01
# package information
Name: j2se14
@@ -38,16 +38,18 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20030925
+Release: 20030926
# list of sources
Source0: http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-linux-i586.bin
Source1: http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-solaris-sparc.sh
Source2: http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-solaris-sparcv9.sh
-Source3: rc.j2se14
+Source3: http://java.sun.com/j2se/::/j2sdk-%{V_sunjava}-solaris-i586.sh
+Source4: rc.j2se14
%NoSource 0
%NoSource 1
%NoSource 2
+%NoSource 3
# build information
Prefix: %{l_prefix}
@@ -80,15 +82,19 @@
suppfile=""
pkgdir=%{V_filesys}
case "%{l_platform -t}" in
- *-linux2.[2-5]* | *-freebsd[45]* )
+ i?86-linux2.[2-6]* | i?86-freebsd[45]* )
pkgfile="%{SOURCE j2sdk-%{V_sunjava}-linux-i586.bin}"
pkgdir="j2sdk%{V_filesys}"
;;
- *-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* )
pkgfile="%{SOURCE j2sdk-%{V_sunjava}-solaris-sparc.sh}"
suppfile="%{SOURCE j2sdk-%{V_sunjava}-solaris-sparcv9.sh}"
pkgdir="j2sdk%{V_filesys}"
;;
+ i?86-sunos5.[6-9]* )
+ pkgfile="%{SOURCE j2sdk-%{V_sunjava}-solaris-i586.sh}"
+ pkgdir="j2sdk%{V_filesys}"
+ ;;
esac
if [ ".$pkgfile" = . ]; then
echo "Sorry, unsupported architecture '%{l_platform -t}'" 1>&2
@@ -102,21 +108,25 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc
+ $RPM_BUILD_ROOT%{l_prefix}/share/j2se14
# unpack vendor distribution
( umask 022
cd $RPM_BUILD_ROOT%{l_prefix}/libexec
case "%{l_platform -t}" in
- *-linux2.[2-5]* | *-freebsd4* )
+ i?86-linux2.[2-6]* | i?86-freebsd[45]* )
echo "yes" | sh $pkgfile \
- >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.32
+ >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
;;
- sparc64-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* )
echo "yes" | sh $pkgfile \
- >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.32
+ >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
echo "yes" | sh $suppfile \
- >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/doc/COPYING.64
+ >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.64
+ ;;
+ i?86-sunos5.[6-9]* )
+ echo "yes" | sh $pkgfile \
+ >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
;;
esac
mv $pkgdir j2se14
@@ -128,7 +138,7 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/jre/bin
find . -type f -print | xargs chmod u+w
case "%{l_platform -t}" in
- sparc64-sunos5.[6-9]* )
+ sun4u-sunos5.[6-9]* )
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/bin/sparcv9
find . -type f -print | xargs chmod u+w
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/jre/bin/sparcv9
@@ -139,7 +149,7 @@
# optionally brand ELF binaries (FreeBSD only)
case "%{l_platform -t}" in
- *-freebsd4* )
+ i?86-freebsd[45]* )
brandelf -t Linux \
`find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/bin/ -type f
-print` \
>/dev/null 2>&1 || true
@@ -149,12 +159,7 @@
;;
esac
- # clean out installation area
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/demo 2>/dev/null || true
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/kinit.1
- rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/klist.1
-
- # reduce man pages to essential ones and move them to final location
+ # copy man pages to a final location
if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/man/man1 ]; then
cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/man/man1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
@@ -162,14 +167,19 @@
cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/man/sman1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1
fi
+
+ # remove unwanted files
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/kinit.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/klist.1
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/ktab.1
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/man 2>/dev/null || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/demo 2>/dev/null || true
# link developer binaries
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- for bin in appletviewer extcheck idlj jar jarsigner java \
- javac javadoc javah javap jdb keytool native2ascii \
- orbd policytool rmic rmid rmiregistry serialver servertool \
- tnameserv; do
+ for bin in HtmlConverter appletviewer extcheck idlj jar jarsigner \
+ java javac javadoc javah javap jdb keytool native2ascii orbd \
+ policytool rmic rmid rmiregistry serialver servertool tnameserv; do
ln -s ../libexec/j2se14/bin/$bin .
done
) || exit $?
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6748 -r1.6749 news.txt
--- openpkg-web/news.txt 26 Sep 2003 16:45:46 -0000 1.6748
+++ openpkg-web/news.txt 26 Sep 2003 17:53:13 -0000 1.6749
@@ -1,3 +1,4 @@
+26-Sep-2003: Upgraded package: P<j2se14-1.4.2.01-20030926>
26-Sep-2003: Upgraded package: P<j2se-1.3.1-20030926>
26-Sep-2003: Upgraded package: P<honeyd-0.6a-20030926>
26-Sep-2003: Upgraded package: P<bind-9.2.3rc4-20030926>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
