OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-web, openpkg-src Date: 10-Nov-2002 13:13:25 Branch: HEAD Handle: 2002111012132401 Added files: openpkg-src/j2se j2se.patch Modified files: openpkg-src/j2se j2se.spec rc.j2se openpkg-web news.txt Log: downgrade this to 1.3.1 Summary: Revision Changes Path 1.3 +141 -0 openpkg-src/j2se/j2se.patch 1.10 +78 -100 openpkg-src/j2se/j2se.spec 1.2 +1 -1 openpkg-src/j2se/rc.j2se 1.1982 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ Index: openpkg-src/j2se/j2se.patch ============================================================ $ cvs update -p -r1.3 j2se.patch --- bin/.java_wrapper.orig Fri May 25 14:39:58 2001 +++ bin/.java_wrapper Fri May 25 14:42:25 2001 @@ -34,8 +34,8 @@ # Resolve symlinks. See 4152645. while [ -L "$PRG" ]; do ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/' > /dev/null; then + link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'` + if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then PRG="$link" else PRG="`dirname $PRG`/$link" --- jre/bin/.java_wrapper.orig Fri May 25 14:39:58 2001 +++ jre/bin/.java_wrapper Fri May 25 14:42:25 2001 @@ -34,8 +34,8 @@ # Resolve symlinks. See 4152645. while [ -L "$PRG" ]; do ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/' > /dev/null; then + link=`/compat/linux/usr/bin/expr "$ls" : '.*-> \(.*\)$'` + if /compat/linux/usr/bin/expr "$link" : '/' > /dev/null; then PRG="$link" else PRG="`dirname $PRG`/$link" --- jre/lib/font.properties.orig Fri May 25 15:17:02 2001 +++ jre/lib/font.properties Fri May 25 15:18:50 2001 @@ -13,79 +13,80 @@ # # -# Linux version derived from the version for SunOS 5.5.1 Notice that +# FreeBSD version derived from the Linux version derived from the +# version for SunOS 5.5.1 Notice that # we use the .ttf files shipped in the JDK distribution. # # Serif font definition # serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#serif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#serif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#serif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#serif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # SansSerif font definition # sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#sansserif.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#sansserif.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#sansserif.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#sansserif.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Monospaced font definition # monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#monospaced.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific monospaced.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#monospaced.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#monospaced.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#monospaced.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Dialog font definition # dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialog.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialog.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialog.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialog.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # DialogInput font definition # dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialoginput.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialoginput.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialoginput.italic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialoginput.bold.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific +#dialoginput.bolditalic.1=--symbol-medium-r-normal--*-%d-*-*-p-*-adobe-fontspecific # Default font definition # --- jre/lib/jvm.cfg.orig Fri Feb 9 13:24:23 2001 +++ jre/lib/jvm.cfg Tue May 15 09:41:16 2001 @@ -8,7 +8,7 @@ # List of JVMs that can be used as the first option to java, javac, etc. # Order is important -- first in this list is the default JVM. # +-classic -client -hotspot -server --classic Index: openpkg-src/j2se/j2se.spec ============================================================ $ cvs diff -u -r1.9 -r1.10 j2se.spec --- openpkg-src/j2se/j2se.spec 5 Nov 2002 16:44:46 -0000 1.9 +++ openpkg-src/j2se/j2se.spec 10 Nov 2002 12:13:25 -0000 1.10 @@ -23,13 +23,22 @@ ## # package versions -%define V_sunjava 1_4_1_01 -%define V_filesys 1.4.1_01 -%define V_openpkg 1.4.1.01 +%define V_openpkg 1.3.1 +%define V_sol_dist 1_3_1_06 +%define V_sol_fsys 1.3.1_06 +%define V_lnx_dist 1_3_1_06 +%define V_lnx_fsys 1.3.1_06 +%define V_bsd_dist 1.3.1p7_1 +%define V_bsd_fsys 1.3.1 + +# package options +%ifndef with_native +%define with_native yes +%endif # package information Name: j2se -Summary: Java 2 Platform, Standard Edition (J2SE) +Summary: Java 2 Platform, Standard Edition (J2SE) 1.3 URL: http://java.sun.com/j2se/ Vendor: Sun Microsystems, Inc. Packager: The OpenPKG Project @@ -37,13 +46,14 @@ Group: Language License: Commercial Version: %{V_openpkg} -Release: 20021105 +Release: 20021110 # list of sources -Source0: j2sdk-%{V_sunjava}-linux-i586.bin -Source1: j2sdk-%{V_sunjava}-solaris-sparc.sh -Source2: j2sdk-%{V_sunjava}-solaris-sparcv9.sh -Source3: rc.j2se +Source0: j2sdk-%{V_sol_dist}-solaris-sparc.sh +Source1: j2sdk-%{V_lnx_dist}-linux-i586.bin +Source2: j2sdk-%{V_bsd_dist}-freebsd-ix86.tar.bz2 +Source3: rc.%{name} +Source4: %{name}.patch # build information Prefix: %{l_prefix} @@ -52,122 +62,90 @@ PreReq: OpenPKG, openpkg >= 20020714 AutoReq: no AutoReqProv: no -Provides: JRE +Provides: JDK, JRE %description - 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. + This is the Sun Java 2 Platform, Standard Edition (J2SE) 1.3. + 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. %prep - %setup -q -c j2se -T + %setup -q -c %{name} -T %build + # no-op %install rm -rf $RPM_BUILD_ROOT - # select vendor source - pkgfile="" - suppfile="" - pkgdir=%{V_filesys} - case "%{l_target}" in - ix86-linux2.[2-5]* | ix86-freebsd4* ) - pkgfile="j2sdk-%{V_sunjava}-linux-i586.bin" - pkgdir="j2sdk%{V_filesys}" - ;; - sparc64-solaris2.[6-9]*) - pkgfile="j2sdk-%{V_sunjava}-solaris-sparc.sh" - suppfile="j2sdk-%{V_sunjava}-solaris-sparcv9.sh" - pkgdir="j2sdk%{V_filesys}" - ;; - esac - if [ ".$pkgfile" = . ]; then - echo "Sorry, unsupported architecture '%{l_target}'" 1>&2 - exit 1 - fi - # create installation tree %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/bin \ $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/j2se/doc - - # unpack vendor distribution - ( umask 022 - cd $RPM_BUILD_ROOT%{l_prefix}/libexec - case "%{l_target}" in - ix86-linux2.[2-5]* | ix86-freebsd4* ) - echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \ - >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING.32 - ;; - sparc64-solaris2.[6-9]*) - echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \ - >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING.32 - echo "yes" | sh $RPM_SOURCE_DIR/$suppfile \ - >$RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc/COPYING.64 - ;; - esac - mv $pkgdir j2se - ) + $RPM_BUILD_ROOT%{l_prefix}/man/man1 - # fix vendor distribution - ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin - find . -type f -print | xargs chmod u+w - cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin - find . -type f -print | xargs chmod u+w - case "%{l_target}" in - sparc64-solaris2.[6-9]*) - cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin/sparcv9 - find . -type f -print | xargs chmod u+w - cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin/sparcv9 - find . -type f -print | xargs chmod u+w - ;; - esac + # unpack source distribution + ( umask 022 + cd $RPM_BUILD_ROOT%{l_prefix}/libexec + case "%{l_target}" in + ix86-freebsd4* ) +%if "%{with_native}" == "yes" + %{l_bzip2} -d -c %{SOURCE j2sdk-%{V_bsd_dist}-freebsd-ix86.tar.bz2} |\ + %{l_tar} xf - + mv j2sdk-%{V_bsd_fsys} %{name} +%else + echo "yes" | sh %{SOURCE j2sdk-%{V_lnx_dist}-linux-i586.bin} >/dev/null + mv jdk%{V_lnx_fsys} %{name} + find %{name}/bin -type f -print | xargs chmod u+w + ( cd %{name}; %{l_patch} -p0 <%{SOURCE %{name}.patch} ) + brandelf -t Linux \ + `find %{name}/bin/ -type f -print` \ + >/dev/null 2>&1 || true +%endif + ;; + ix86-linux2.[2-6]* ) + echo "yes" | sh $RPM_SOURCE_DIR/j2sdk-%{V_lnx_dist}-linux-i586.bin >/dev/null + mv jdk%{V_lnx_fsys} %{name} + ;; + sparc64-solaris2.[6-9]* ) + echo "yes" | sh $RPM_SOURCE_DIR/j2sdk-%{V_sol_dist}-solaris-sparc.sh >/dev/null + mv j2sdk%{V_sol_fsys} %{name} + ;; + * ) + echo "Sorry, unsupported architecture '%{l_target}'" 1>&2 + exit 1 + ;; + esac ) - # optionally brand ELF binaries (FreeBSD only) - case "%{l_target}" in - ix86-freebsd4* ) - brandelf -t Linux \ - `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin/ -type f -print` \ - >/dev/null 2>&1 || true - brandelf -t Linux \ - `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin/ -type f -print` \ - >/dev/null 2>&1 || true - ;; - esac - - # clean out installation area - rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true - - # reduce man pages to essential ones and move them to final location - if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1 ]; then - cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1 - elif [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1 ]; then - cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1/* \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1 - fi - rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true + # post-adjustments to installation area + rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/demo 2>/dev/null || true + cp $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/man/man1/* \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ + rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/%{name}/man 2>/dev/null || true - # link developer binaries + # activate binaries ( cd $RPM_BUILD_ROOT%{l_prefix}/bin - for bin in appletviewer extcheck idlj jar jarsigner java \ - java-rmi.cgi 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 appletviewer awt_robot extcheck idlj jar jarsigner java \ + javac javadoc javah javap jdb keytool native2ascii \ + oldjava oldjavac oldjdb policytool rmic rmid rmiregistry \ + serialver tnameserv; do + ln -s ../libexec/%{name}/bin/$bin . done + ( echo "#!/bin/sh" + echo "exec %{l_prefix}/libexec/%{name}/bin/realpath \${1+\"\$@\"}" + ) >realpath + chmod 755 realpath ) # install run-command script %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \ - %{SOURCE rc.j2se} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} Index: openpkg-src/j2se/rc.j2se ============================================================ $ cvs diff -u -r1.1 -r1.2 rc.j2se --- openpkg-src/j2se/rc.j2se 25 Sep 2002 17:11:08 -0000 1.1 +++ openpkg-src/j2se/rc.j2se 10 Nov 2002 12:13:25 -0000 1.2 @@ -1,6 +1,6 @@ #!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc ## -## rc.j2se -- Run-Commands for the Sun Java 2 Platform, Standard Edition +## rc.j2se -- Run-Commands for J2SE ## %config Index: openpkg-web/news.txt ============================================================ $ cvs diff -u -r1.1981 -r1.1982 news.txt --- openpkg-web/news.txt 10 Nov 2002 08:37:30 -0000 1.1981 +++ openpkg-web/news.txt 10 Nov 2002 12:13:24 -0000 1.1982 @@ -1,3 +1,4 @@ +10-Nov-2002: Upgraded package: P<j2se-1.3.1-20021110> 10-Nov-2002: Upgraded package: P<ncurses-5.3.20021109-20021110> 10-Nov-2002: Upgraded package: P<perl-parse-20021110-20021110> 09-Nov-2002: Upgraded package: P<iozone-3.141-20021109> ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]