OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Apr-2005 19:15:54
Branch: HEAD Handle: 2005041918155300
Modified files:
openpkg-src/j2se j2se.spec rc.j2se
Log:
conditionally requires infozip to unpack optional components, improve
description text, abstract hardcoded tracking version to a variable,
use consistent 'pkgfile#' naming, correct broken 'libexec/j2se' paths,
rename instead of remove conflicting manpages, remove new distributed
GNOME files, and link in new developer binaries
Summary:
Revision Changes Path
1.53 +51 -37 openpkg-src/j2se/j2se.spec
1.11 +1 -1 openpkg-src/j2se/rc.j2se
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 j2se.spec
--- openpkg-src/j2se/j2se.spec 8 Apr 2005 18:51:17 -0000 1.52
+++ openpkg-src/j2se/j2se.spec 19 Apr 2005 17:15:53 -0000 1.53
@@ -27,6 +27,7 @@
%define V_sunjava 1_5_0_02
%define V_filesys 1.5.0_02
%define V_sunsupp 1_5_0
+%define V_basever 1.5.0
# package information
Name: j2se
@@ -39,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050408
+Release: 20050419
# package options
%option with_demo no
@@ -66,24 +67,26 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_docs}" == "yes" || "%{with_jce}" == "yes"
+BuildPreReq: infozip
+%endif
AutoReq: no
AutoReqProv: no
Provides: JDK, JRE
Conflicts: j2se14
%description
- This is the Sun Java 2 Platform, Standard Edition (J2SE) 5.0, aka
- J2SE 1.5.0. It contains the Java Development Kit (JDK) and the
- Java Runtime Environment (JRE). The premier solution for rapidly
- developing and deploying mission-critical, enterprise applications,
- J2SE provides the essential compiler, tools, runtimes, and APIs for
- writing, deploying, and running applets and applications in the Java
- programming language.
+ The Sun Java 2 Platform Standard Edition (J2SE) 5.0 contains both
+ the Java Development Kit (JDK) and Java Runtime Environment (JRE).
+ The premier solution for rapidly developing and deploying mission-
+ critical, enterprise applications, J2SE provides the essential
+ compiler, tools, runtimes, and APIs for writing, deploying, and
+ running applets and applications in the Java programming language.
%track
prog j2se = {
- version = %{V_filesys}
- url = http://java.sun.com/j2se/1.5.0/download.jsp
+ version = %{V_sunjava}
+ url = http://java.sun.com/j2se/%{V_basever}/download.jsp
regex = jre-(__VER__)-
}
@@ -96,27 +99,27 @@
rm -rf $RPM_BUILD_ROOT
# select vendor source
- pkgfile=""
+ pkgfile1=""
pkgfile2=""
docsfile="%{SOURCE jdk-%{V_sunsupp}-doc.zip}"
cryptfile="%{SOURCE jce_policy-%{V_sunsupp}.zip}"
pkgdir="%{V_filesys}"
case "%{l_platform -t}" in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
- pkgfile="%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}"
+ pkgfile1="%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}"
pkgdir="jdk%{V_filesys}"
;;
sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
- pkgfile="%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}"
+ pkgfile1="%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}"
pkgfile2="%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}"
pkgdir="jdk%{V_filesys}"
;;
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
- pkgfile="%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}"
+ pkgfile1="%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}"
pkgdir="jdk%{V_filesys}"
;;
esac
- if [ ".$pkgfile" = . ]; then
+ if [ ".$pkgfile1" = . ]; then
echo "Sorry, unsupported architecture '%{l_platform -t}'" 1>&2
exit 1
fi
@@ -135,14 +138,14 @@
HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se
case "%{l_platform -t}" in
i?86-linux2.[2-6]* | i?86-freebsd[45]* )
- echo "yes" | sh $pkgfile >COPYING.32
+ echo "yes" | sh $pkgfile1 >COPYING.32
;;
sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
- echo "yes" | sh $pkgfile >COPYING.32 && \
+ echo "yes" | sh $pkgfile1 >COPYING.32 && \
echo "yes" | sh $pkgfile2 >COPYING.64
;;
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
- echo "yes" | sh $pkgfile >COPYING.32
+ echo "yes" | sh $pkgfile1 >COPYING.32
;;
* ) false
;;
@@ -184,29 +187,36 @@
esac
# move man pages to a canonical location
- if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1 ]; then
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
+ if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/man1
]; then
+ mv
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/man1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
- elif [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1 ]; then
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1/* \
+ elif [ -d
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/sman1 ]; then
+ mv
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/sman1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
fi
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man
2>/dev/null || true
- # remove man pages conflicting with Kerberos
- 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
+ # move man pages conflicting with Kerberos
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/kinit.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/j2se-kinit.1
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/klist.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/j2se-klist.1
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/ktab.1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/j2se-ktab.1
+
+ # remove GNOME and other irrelevant files
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/.gnome
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/.icons
- # remove demos if unwanted
+ # conditionally remove demo
%if "%{with_demo}" == "no"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/demo
2>/dev/null || true
%endif
- # unpack docs if wanted
+ # conditionally install docs
%if "%{with_docs}" == "yes"
unzip -q $docsfile
- mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/
+ mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/
%endif
# install Java Cryptography Extension (JCE) Unlimited Strength
Jurisdiction Policy
@@ -221,18 +231,22 @@
# link developer binaries
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- 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/j2se/bin/$bin .
+ for bin in ControlPanel HtmlConverter appletviewer apt extcheck \
+ idlj jar jarsigner java javac javadoc javah javap javaws \
+ jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd \
+ keytool native2ascii orbd pack200 policytool rmic rmid \
+ rmiregistry serialver servertool tnameserv unpack200; do
+ ln -s ../libexec/j2se/jdk%{V_filesys}/bin/$bin .
done
) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}/cgi
- ln -s ../libexec/j2se/bin/java-rmi.cgi java-rmi.cgi
+ ln -s ../libexec/j2se/jdk%{V_filesys}/bin/java-rmi.cgi java-rmi.cgi
) || exit $?
# install run-command script
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{l_shtool} install \
+ -c -m 755 %{l_value -s -a} \
+ -e 's;@javer@;jdk%{V_filesys};' \
%{SOURCE rc.j2se} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# determine installation files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/rc.j2se
============================================================================
$ cvs diff -u -r1.10 -r1.11 rc.j2se
--- openpkg-src/j2se/rc.j2se 8 Apr 2005 18:51:17 -0000 1.10
+++ openpkg-src/j2se/rc.j2se 19 Apr 2005 17:15:53 -0000 1.11
@@ -5,7 +5,7 @@
%config
j2se_enable="$openpkg_rc_def"
- j2se_home="@l_prefix@/libexec/j2se"
+ j2se_home="@l_prefix@/libexec/j2se/@javer@"
JRE_home=$j2se_home
JDK_home=$j2se_home
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
