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

  Server: cvs.openpkg.org                  Name:   Peter Smej
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re, openpkg-web, openpkg-src Date:   22-Nov-2002 15:38:12
  Branch: HEAD                             Handle: 2002112214381001

  Modified files:
    openpkg-re/vcheck       vc.tsmc
    openpkg-src/tsmc        dsm.sys dsmexec tsmc.spec
    openpkg-web             news.txt

  Log:
    upgrading package: tsmc 4.2.2.1 -> 5.1.5.2

  Summary:
    Revision    Changes     Path
    1.6         +13 -12     openpkg-re/vcheck/vc.tsmc
    1.4         +2  -6      openpkg-src/tsmc/dsm.sys
    1.5         +10 -17     openpkg-src/tsmc/dsmexec
    1.21        +19 -12     openpkg-src/tsmc/tsmc.spec
    1.2094      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  Index: openpkg-re/vcheck/vc.tsmc
  ============================================================
  $ cvs diff -u -r1.5 -r1.6 vc.tsmc
  --- openpkg-re/vcheck/vc.tsmc 31 May 2002 07:46:52 -0000      1.5
  +++ openpkg-re/vcheck/vc.tsmc 22 Nov 2002 14:38:10 -0000      1.6
  @@ -2,19 +2,20 @@
   }
   
   prog tsmc:linux = {
  -  version    = v4221
  -  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/
  -  regex      = (v4r\d+)
  -  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/__NEWVER__/Linux86/
  -  regex      = (v4\d+)
  -  dlexplicit = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/__NEWVER1__/Linux86/__NEWVER__/IP22369\.tar
  +  version    = v5152
  +  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/
  +  regex      = (vr5r\d+)
  +  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/__NEWVER__/
  +  regex      = (v5\d+)
  +  dlexplicit = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/__NEWVER1__/TIVsm-BA\.i386\.rpm
   }
   prog tsmc:solaris = {
  -  version    = v4221
  -  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/
  -  regex      = (v4r\d+)
  -  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/__NEWVER__/Solaris/
  -  regex      = (v4\d+)
  -  dlexplicit = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/__NEWVER1__/Solaris/__NEWVER__/IP22372\.tar\.Z
  +  version    = v5152
  +  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Solaris
  +  regex      = (v5r\d+)
  +  url        = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Solaris/__NEWVER__/Solaris/
  +  regex      = (v5\d+)
  +  dlexplicit = 
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Solaris/__NEWVER1__/Solaris/__NEWVER__/IP22545\_2\.tar\.Z
 
   }
  +
   
  Index: openpkg-src/tsmc/dsm.sys
  ============================================================
  $ cvs diff -u -r1.3 -r1.4 dsm.sys
  --- openpkg-src/tsmc/dsm.sys  16 Apr 2002 19:05:47 -0000      1.3
  +++ openpkg-src/tsmc/dsm.sys  22 Nov 2002 14:38:11 -0000      1.4
  @@ -8,7 +8,7 @@
      TCPServerAddress    192.168.0.1
      TCPPort             1500
      TCPNoDelay          yes
  -   PasswordAccess      prompt
  +   PasswordAccess      generate
      NodeName            foo.example.com
   
      SchedLogName        @l_prefix@/var/tsmc/dsm.sched.log
  @@ -17,11 +17,7 @@
      ErrorLogRetention   14 D
   
      SchedMode           prompted
  -   ResourceUtilization 4
  -   ChangingRetries     3
  -   MaxCmdRetries       3
  -   RetryPeriod         15
  -   MemoryEff           yes
  +   ResourceUtilization @resutil@
   
   *  VirtualMountPoint   @l_prefix@
   *  Domain              @l_prefix@
  Index: openpkg-src/tsmc/dsmexec
  ============================================================
  $ cvs diff -u -r1.4 -r1.5 dsmexec
  --- openpkg-src/tsmc/dsmexec  23 Sep 2002 07:11:09 -0000      1.4
  +++ openpkg-src/tsmc/dsmexec  22 Nov 2002 14:38:11 -0000      1.5
  @@ -3,7 +3,9 @@
   ##  TSM Run-Time Executable Wrapper Script
   ##
   
  -prog="`echo $0 | sed -e 's;.*/\([^/]*\)$;\1;'`"
  +
  +prog="dsmc"
  +
   prefix="@l_prefix@"
   
   if [ ! -f "$prefix/libexec/tsmc/$prog" ]; then
  @@ -11,26 +13,17 @@
       exit 1
   fi
   
  -DSM_CONFIG="$prefix/libexec/tsmc/dsm.opt"
  -export DSM_CONFIG
   
   DSM_DIR="$prefix/libexec/tsmc"
   export DSM_DIR
   
  -LD_LIBRARY_PATH=""
  -for dir in /lib /usr/lib /usr/ccs/lib; do
  -    if [ -d $dir ]; then
  -        if [ ".$LD_LIBRARY_PATH" = . ]; then
  -            LD_LIBRARY_PATH="$dir"
  -        else
  -            LD_LIBRARY_PATH="$dir:${LD_LIBRARY_PATH}"
  -        fi
  -    fi
  -done
  -if [ -d "$prefix/libexec/tsmc/lib" ]; then
  -    LD_LIBRARY_PATH="$prefix/libexec/tsmc/lib:${LD_LIBRARY_PATH}"
  -fi
  -export LD_LIBRARY_PATH
  +
  +DSM_CONFIG="$prefix/libexec/tsmc/dsm.opt"
  +export DSM_CONFIG
  +
  +
  +LANG="en_US"
  +export LANG
   
   exec $prefix/libexec/tsmc/$prog "$@"
   
  Index: openpkg-src/tsmc/tsmc.spec
  ============================================================
  $ cvs diff -u -r1.20 -r1.21 tsmc.spec
  --- openpkg-src/tsmc/tsmc.spec        22 Nov 2002 09:59:09 -0000      1.20
  +++ openpkg-src/tsmc/tsmc.spec        22 Nov 2002 14:38:11 -0000      1.21
  @@ -32,12 +32,12 @@
   Distribution: OpenPKG [PRIV]
   Group:        Converter
   License:      Commercial
  -Version:      4.2.2.1
  +Version:      5.1.5.2
   Release:      20021122
   
   #   list of sources
  -Source0:      
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Linux86/v4221/IP22508_1.tar
  -Source1:      
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Solaris/v4221/IP22502_1.tar.Z
  +Source0:      
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Linux/Linux86/v515/TIVsm-BA.i386.rpm
  +Source1:      
ftp://service.boulder.ibm.com/storage/tivoli-storage-management/patches/client/v5r1/Solaris/v515/IP22545_2.tar.Z
   Source2:      dsmexec
   Source3:      dsm.sys
   Source4:      dsm.opt
  @@ -46,14 +46,14 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20021120
  -PreReq:       OpenPKG, openpkg >= 20021120
  +BuildPreReq:  OpenPKG, openpkg >= 20021009, tar, gzip
  +PreReq:       OpenPKG, openpkg >= 20021009
   AutoReq:      no
   AutoReqProv:  no
   
   %description
       This is a stripped down version of the client part of the Tivoli
  -    Storage Manager (TSM v4) software. It can be used to backup Solaris,
  +    Storage Manager (TSM v5) software. It can be used to backup Solaris,
       Linux and FreeBSD machines to a TSM server.
   
   %prep
  @@ -63,17 +63,19 @@
       #   unpack the corresponding binary only
       case "%{l_target}" in
           *-freebsd* | *-linux* )
  -            %{l_tar} xf %{SOURCE IP22508_1.tar}
  +                      cp %{SOURCE  TIVsm-BA.i386.rpm} ./
               %{l_prefix}/bin/rpm2cpio TIVsm-BA.i386.rpm | cpio -idmu
               mv opt/tivoli/tsm/client root
               ;;
           *-solaris* )
  -            %{l_gzip} -d -c %{SOURCE IP22502_1.tar.Z} | %{l_tar} xf -
  +            %{l_prefix}/bin/gzip -d -c %{SOURCE IP22545_2.tar.Z} |\
  +            %{l_prefix}/bin/tar xf -
               pkgtrans `pwd`/TIVsmCba.pkg `pwd` TIVsmCba
               mv TIVsmCba/reloc root
               ;;
       esac
   
  +
   %install
       rm -rf $RPM_BUILD_ROOT
   
  @@ -93,7 +95,7 @@
           %{SOURCE dsmexec} $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
   
       #   install binaries
  -    for f in dsmagent dsmc dsmcad dsmstat dsmtca dsmadmc; do
  +    for f in dsmadmc dsmagent dsmc dsmcad dsmtca ; do
           file="root/ba/bin/$f"
           if [ -f "root/admin/bin/$f" ]; then
               file="root/admin/bin/$f"
  @@ -111,12 +113,17 @@
       %{l_shtool} install -c -m 644 \
           root/ba/bin/en_US/* \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/DDsmResources.java 
>/dev/null 2>&1 || true
       rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/wchelp.htl >/dev/null 2>&1 
|| true
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/*.tif >/dev/null 2>&1 || 
true
   
  +
  +     # decide ResourceUtilisation for OS
  +    case "%{l_target}" in
  +        *-freebsd* ) l_resutil="1";;
  +         * ) l_resutil="2";; 
  +     esac 
       #   install default configuration
       %{l_shtool} install -c -m 755 \
  +             -e 's;@resutil@;'$l_resutil';g' \
           -e 's;@l_prefix@;%{l_prefix};g' \
           %{SOURCE dsm.opt} %{SOURCE dsm.sys} \
           $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
  @@ -146,7 +153,7 @@
   %files -f files
   
   %clean
  -    rm -rf $RPM_BUILD_ROOT
  +#    rm -rf $RPM_BUILD_ROOT
   
   %post
       if [ $1 -eq 1 ]; then
  Index: openpkg-web/news.txt
  ============================================================
  $ cvs diff -u -r1.2093 -r1.2094 news.txt
  --- openpkg-web/news.txt      22 Nov 2002 11:52:52 -0000      1.2093
  +++ openpkg-web/news.txt      22 Nov 2002 14:38:10 -0000      1.2094
  @@ -1,3 +1,4 @@
  +22-Nov-2002: Upgraded package: P<tsmc-5.1.5.2-20021122>
   22-Nov-2002: Upgraded package: P<openvpn-1.3.2-20021122>
   22-Nov-2002: Upgraded package: P<dxpc-3.8.2-20021122>
   22-Nov-2002: Upgraded package: P<lzop-1.00-20021122>
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to