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 19:54:15
  Branch: HEAD                             Handle: 2005040818541500

  Modified files:
    openpkg-src/j2se15      j2se15.spec

  Log:
    cleanup packaging

  Summary:
    Revision    Changes     Path
    1.6         +21 -24     openpkg-src/j2se15/j2se15.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/j2se15/j2se15.spec
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 j2se15.spec
  --- openpkg-src/j2se15/j2se15.spec    8 Apr 2005 16:58:22 -0000       1.5
  +++ openpkg-src/j2se15/j2se15.spec    8 Apr 2005 17:54:15 -0000       1.6
  @@ -23,14 +23,14 @@
   ##
   
   #   package versions
  +%define       V_openpkg 1.5.0.02
   %define       V_sunjava 1_5_0_02
   %define       V_filesys 1.5.0_02
  -%define       V_openpkg 1.5.0.02
   %define       V_sunsupp 1_5_0
   
   #   package information
   Name:         j2se15
  -Summary:      Java 2 Platform, Standard Edition (J2SE) 1.5 (aka 5.0)
  +Summary:      Java 2 Platform, Standard Edition (J2SE)
   URL:          http://java.sun.com/j2se/
   Vendor:       Sun Microsystems, Inc.
   Packager:     OpenPKG
  @@ -72,19 +72,19 @@
   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) 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.
   
   %track
       prog j2se15 = {
  -        disabled
  -        comment   = "rse: no tracking possible"
  -        version   = %{V_sunjava}
  -        url       = http://java.sun.com/j2se/
  -        regex     = j2se-(__VER__)\.tar\.gz
  +        version   = %{V_filesys}
  +        url       = http://java.sun.com/j2se/1.5.0/download.jsp
  +        regex     = jre-(__VER__)-
       }
   
   %prep
  @@ -97,7 +97,7 @@
   
       #   select vendor source
       pkgfile=""
  -    suppfile=""
  +    pkgfile2=""
       docsfile="%{SOURCE jdk-%{V_sunsupp}-doc.zip}"
       cryptfile="%{SOURCE jce_policy-%{V_sunsupp}.zip}"
       pkgdir=%{V_filesys}
  @@ -108,7 +108,7 @@
               ;;
           sun4u-sunos5.[6-9]* )
               pkgfile="%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}"
  -            suppfile="%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}"
  +            pkgfile2="%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}"
               pkgdir="jdk%{V_filesys}"
               ;;
           i?86-sunos5.[6-9]* )
  @@ -127,8 +127,7 @@
           $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/j2se15
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1
   
       #   unpack vendor distribution
       (   umask 022
  @@ -136,21 +135,19 @@
           HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se15
           case "%{l_platform -t}" in
               i?86-linux2.[2-6]* | i?86-freebsd[45]* )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
  +                echo "yes" | sh $pkgfile  >COPYING.32
                   ;;
               sun4u-sunos5.[6-9]* )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
  -                echo "yes" | sh $suppfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.64
  +                echo "yes" | sh $pkgfile  >COPYING.32
  +                echo "yes" | sh $pkgfile2 >COPYING.64
                   ;;
               i?86-sunos5.[6-9]* )
  -                echo "yes" | sh $pkgfile \
  -                    >$RPM_BUILD_ROOT%{l_prefix}/share/j2se15/COPYING.32
  +                echo "yes" | sh $pkgfile  >COPYING.32
                   ;;
           esac
  -        mv $pkgdir j2se15
  +        mv $pkgdir/* j2se15/
  +        mv COPYING.* j2se15/
  +        rmdir $pkgdir
       ) || exit $?
   
       #   fix vendor distribution
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to