fix packaging again

tsmc/dsm.sys

@@ -8,7 +8,7 @@ ServerName tsm.example.com
    TCPServerAddress    192.168.0.1
    TCPPort             1500
    TCPNoDelay          yes
-   PasswordAccess      generate
+   PasswordAccess      prompt
    NodeName            foo.example.com
 
    SchedLogName        @l_prefix@/var/tsmc/dsm.sched.log
@@ -18,6 +18,10 @@ ServerName tsm.example.com
 
    SchedMode           prompted
    ResourceUtilization @resutil@
+*  ChangingRetries     3
+*  MaxCmdRetries       3
+*  RetryPeriod         15
+*  MemoryEff           yes
 
 *  VirtualMountPoint   @l_prefix@
 *  Domain              @l_prefix@

tsmc/dsmexec

@@ -3,8 +3,7 @@
 ##  TSM Run-Time Executable Wrapper Script
 ##
 
-
-prog="dsmc"
+prog="`echo $0 | sed -e 's;.*/\([^/]*\)$;\1;'`"
 
 prefix="@l_prefix@"
 
@@ -13,15 +12,27 @@ if [ ! -f "$prefix/libexec/tsmc/$prog" ]; then
     exit 1
 fi
 
+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_DIR="$prefix/libexec/tsmc"
 export DSM_DIR
 
-
 DSM_CONFIG="$prefix/libexec/tsmc/dsm.opt"
 export DSM_CONFIG
 
-
 LANG="en_US"
 export LANG
 

tsmc/tsmc.spec

@@ -46,8 +46,8 @@ Source5:      rc.tsmc
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021009, tar, gzip
-PreReq:       OpenPKG, openpkg >= 20021009
+BuildPreReq:  OpenPKG, openpkg >= 20021120
+PreReq:       OpenPKG, openpkg >= 20021120
 AutoReq:      no
 AutoReqProv:  no
 
@@ -63,19 +63,16 @@ AutoReqProv:  no
     #   unpack the corresponding binary only
     case "%{l_target}" in
         *-freebsd* | *-linux* )
-			 cp %{SOURCE  TIVsm-BA.i386.rpm} ./
-            %{l_prefix}/bin/rpm2cpio TIVsm-BA.i386.rpm | cpio -idmu
+            %{l_prefix}/bin/rpm2cpio %{SOURCE TIVsm-BA.i386.rpm} | cpio -idmu
             mv opt/tivoli/tsm/client root
             ;;
         *-solaris* )
-            %{l_prefix}/bin/gzip -d -c %{SOURCE IP22545_2.tar.Z} |\
-            %{l_prefix}/bin/tar xf -
+            %{l_gzip} -d -c %{SOURCE IP22545_2.tar.Z} | %{l_tar} xf -
             pkgtrans `pwd`/TIVsmCba.pkg `pwd` TIVsmCba
             mv TIVsmCba/reloc root
             ;;
     esac
 
-
 %install
     rm -rf $RPM_BUILD_ROOT
 
@@ -115,15 +112,13 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US
     rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/en_US/wchelp.htl >/dev/null 2>&1 || true
 
-
-	# decide ResourceUtilisation for OS
-    case "%{l_target}" in
-        *-freebsd* ) l_resutil="1";;
-	    * ) l_resutil="2";; 
-	esac 
     #   install default configuration
+    case "%{l_target}" in
+        *-freebsd* ) l_resutil="1" ;;
+        * )          l_resutil="2" ;; 
+    esac 
     %{l_shtool} install -c -m 755 \
-		-e 's;@resutil@;'$l_resutil';g' \
+        -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/
@@ -153,7 +148,7 @@ AutoReqProv:  no
 %files -f files
 
 %clean
-#    rm -rf $RPM_BUILD_ROOT
+    rm -rf $RPM_BUILD_ROOT
 
 %post
     if [ $1 -eq 1 ]; then