OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   08-Apr-2005 20:42:57
  Branch: HEAD                             Handle: 2005040819425700

  Modified files:
    openpkg-src/j2se14      j2se14.spec

  Log:
    synchronize with j2se15 package

  Summary:
    Revision    Changes     Path
    1.43        +19 -20     openpkg-src/j2se14/j2se14.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/j2se14/j2se14.spec
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 j2se14.spec
  --- openpkg-src/j2se14/j2se14.spec    6 Apr 2005 18:16:39 -0000       1.42
  +++ openpkg-src/j2se14/j2se14.spec    8 Apr 2005 18:42:57 -0000       1.43
  @@ -39,7 +39,7 @@
   Group:        Language
   License:      Commercial
   Version:      %{V_openpkg}
  -Release:      20050406
  +Release:      20050408
   
   #   package options
   %option       with_demo     no
  @@ -72,10 +72,12 @@
   Conflicts:    j2se
   
   %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
  +    This is the Sun Java 2 Platform, Standard Edition (J2SE) 1.4.2.
  +    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.
   
   %track
  @@ -97,10 +99,10 @@
   
       #   select vendor source
       pkgfile=""
  -    suppfile=""
  +    pkgfile2=""
       docsfile="%{SOURCE j2sdk-%{V_sunsupp}-doc.zip}"
       cryptfile="%{SOURCE jce_policy-%{V_sunsupp}.zip}"
  -    pkgdir=%{V_filesys}
  +    pkgdir="%{V_filesys}"
       case "%{l_platform -t}" in
           i?86-linux2.[2-6]* | i?86-freebsd[45]* )
               pkgfile="%{SOURCE j2sdk-%{V_sunjava}-linux-i586.bin}"
  @@ -127,28 +129,24 @@
           $RPM_BUILD_ROOT%{l_prefix}/cgi \
           $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
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1
   
       #   unpack vendor distribution
       (   umask 022
           cd $RPM_BUILD_ROOT%{l_prefix}/libexec
  +        HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14
           case "%{l_platform -t}" in
               i?86-linux2.[2-6]* | i?86-freebsd[45]* )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
  +                echo "yes" | sh $pkgfile  >COPYING.32
                   ;;
               sun4u-sunos5.[6-9]* | sun4u-sunos5.10 )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32 && \
  -                echo "yes" | sh $suppfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.64
  +                echo "yes" | sh $pkgfile  >COPYING.32 && \
  +                echo "yes" | sh $pkgfile2 >COPYING.64
                   ;;
               i?86-sunos5.[6-9]* | i?86-sunos5.10 )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se14/COPYING.32
  +                echo "yes" | sh $pkgfile  >COPYING.32
                   ;;
  -            *) false
  +            * ) false
                   ;;
           esac
           if [ $? != 0 ]; then
  @@ -156,6 +154,7 @@
               exit 1
           fi
           mv $pkgdir j2se14
  +        mv COPYING.* j2se14/
       ) || exit $?
   
       #   fix vendor distribution
  @@ -207,14 +206,14 @@
   
       #   unpack docs if wanted
   %if "%{with_docs}" == "yes"
  -    unzip $docsfile
  +    unzip -q $docsfile
       mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/
   %endif
   
       #   install Java Cryptography Extension (JCE) Unlimited Strength 
Jurisdiction Policy
       #   under confirmation of the US Export Administration Regulations (EAR)
   %if "%{with_jce}" == "yes"
  -    unzip $cryptfile
  +    unzip -q $cryptfile
       cp jce/COPYRIGHT.html 
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/JCE_COPYRIGHT.html
       cp jce/README.txt 
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/JCE_README.txt
       cp -f jce/US_export_policy.jar 
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se14/jre/lib/security/
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to