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:   07-Dec-2005 13:03:27
  Branch: HEAD                             Handle: 2005120712032600

  Modified files:
    openpkg-src/acroread    acroread.spec

  Log:
    supports FreeBSD 6, too

  Summary:
    Revision    Changes     Path
    1.31        +34 -25     openpkg-src/acroread/acroread.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/acroread/acroread.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 acroread.spec
  --- openpkg-src/acroread/acroread.spec        24 Mar 2005 11:18:22 -0000      
1.30
  +++ openpkg-src/acroread/acroread.spec        7 Dec 2005 12:03:26 -0000       
1.31
  @@ -23,13 +23,15 @@
   ##
   
   #   package version
  -%define       V_real     5.10
  -%define       V_comp_lnx 5010
  -%define       V_comp_sol 5010
  +%define       V_real     7.01
  +%define       V_major    7
  +%define       V_minor    0
  +%define       V_comp_lnx 701
  +%define       V_comp_sol 701
   
   #   package information
   Name:         acroread
  -Summary:      Acrobat Reader
  +Summary:      Adobe Acrobat Reader
   URL:          http://www.adobe.com/products/acrobat/
   Vendor:       Adobe
   Packager:     OpenPKG
  @@ -38,11 +40,11 @@
   Group:        Graphics
   License:      Commercial
   Version:      %{V_real}
  -Release:      20041210
  +Release:      20051207
   
   #   list of sources
  -Source0:      
ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/linux-%{V_comp_lnx}.tar.gz
  -Source1:      
ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/solaris-%{V_comp_sol}.tar.gz
  +Source0:      
ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/%{V_major}.%{V_minor}/enu/AdbeRdr%{V_comp_lnx}_linux_enu.tar.gz
  +Source1:      
ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/%{V_major}.%{V_minor}/enu/AdbeRdr%{V_comp_sol}_solaris_enu.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -53,19 +55,23 @@
   AutoReqProv:  no
   
   %description
  -    This is the freely-available Adobe Acrobat Reader (v5) for the
  +    This is the freely-available Adobe Acrobat Reader for the
       Adobe Portable Document Format (PDF).
   
   %track
       prog acroread:linux = {
           version   = %{V_comp_lnx}
  -        url       = ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/
  -        regex     = linux-(__VER__)\.tar\.gz
  +        url       = ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/
  +        regex     = (%{V_major}\.\d+)
  +        url       = 
ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/__NEWVER__/
  +        regex     = AdbeRdr(__VER__)_linux_enu\.tar\.gz
       }
       prog acroread:solaris = {
           version   = %{V_comp_sol}
  -        url       = ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/
  -        regex     = solaris-(__VER__)\.tar\.gz
  +        url       = ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/
  +        regex     = (%{V_major}\.\d+)
  +        url       = 
ftp://ftp.adobe.com/pub/adobe/reader/unix/%{V_major}x/__NEWVER__/
  +        regex     = AdbeRdr(__VER__)_solaris_enu\.tar\.gz
       }
   
   %prep
  @@ -83,8 +89,8 @@
   
       #   unpack the corresponding binary only
       case "%{l_platform -t}" in
  -        i?86-freebsd[45]* )
  -            tarball="%{SOURCE linux-%{V_comp_lnx}.tar.gz}"
  +        i?86-freebsd[456]* )
  +            tarball="%{SOURCE AdbeRdr%{V_comp_lnx}_linux_enu.tar.gz}"
               shell="/compat/linux/bin/sh"
               if [ ! -f $shell ]; then
                   ( echo "The Linux ABI base system is not installed under 
/compat/linux/."
  @@ -94,11 +100,11 @@
               fi
               ;;
           i?86-linux2* )
  -            tarball="%{SOURCE linux-%{V_comp_lnx}.tar.gz}"
  +            tarball="%{SOURCE AdbeRdr%{V_comp_lnx}_linux_enu.tar.gz}"
               shell="/bin/sh"
               ;;
           sun4*-sunos5* )
  -            tarball="%{SOURCE solaris-%{V_comp_sol}.tar.gz}"
  +            tarball="%{SOURCE AdbeRdr%{V_comp_sol}_solaris_enu.tar.gz}"
               shell="/bin/sh"
               ;;
           * ) echo "Platform %{l_platform -t} not supported" | %{l_rpmtool} 
msg -b
  @@ -108,31 +114,34 @@
       %{l_gzip} -c -d $tarball | %{l_tar} xf -
   
       #   perform the standard installation procedure
  -    ( cd installers
  +    ( cd AdobeReader
         %{l_shtool} subst -e 's;Linux);Linux|FreeBSD);' INSTALL
         PAGER="cat"
         export PAGER
  -      ( echo "ACCEPT"
  +      ( echo "accept"
           echo "$RPM_BUILD_ROOT%{l_prefix}/libexec/acroread"
         ) | $shell INSTALL
       ) || exit $?
   
       #   post-adjust installation tree
  -    mv $RPM_BUILD_ROOT%{l_prefix}/libexec/acroread/bin/acroread \
  -       $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
  -    rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/acroread/bin
  -    %{l_shtool} subst \
  -        -e "s;$RPM_BUILD_ROOT%{l_prefix}/libexec;%{l_prefix}/libexec;g" \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
       case "%{l_platform -t}" in
           *-freebsd* )
               %{l_shtool} subst -e 's;#!/bin/sh;#!/compat/linux/bin/sh;' \
  -                $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
  +                $RPM_BUILD_ROOT%{l_prefix}/libexec/acroread/bin/acroread
               brandelf -t Linux \
                   
$RPM_BUILD_ROOT%{l_prefix}/libexec/acroread/Reader/intellinux/bin/*
               ;;
       esac
   
  +    #   install command-line wrapper
  +    ( echo "#!/bin/sh"
  +      echo "exec %{l_prefix}/libexec/acroread/bin/acroread \${1+\"[EMAIL 
PROTECTED]"}"
  +    ) >acroread.sh
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin
  +    %{l_shtool} install -c -m 755 \
  +        acroread.sh $RPM_BUILD_ROOT%{l_prefix}/bin/acroread
  +
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to