upgrading upstream version from 4.2.1 to 4.2.2

tsmc/tsmc.spec

@@ -32,12 +32,12 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Converter
 License:      Commercial
-Version:      4.2.1
-Release:      20020418
+Version:      4.2.2
+Release:      20020510
 
 #   list of sources
-Source0:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Linux86/v421/IP22369.tar
-Source1:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Solaris/v421/IP22372.tar.Z
+Source0:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Linux86/v422/IP22508.tar
+Source1:      ftp://service.boulder.ibm.com/storage/tivoli-storage-management/maintenance/client/v4r2/Solaris/v422/IP22502.tar.Z
 Source2:      dsmexec
 Source3:      dsm.sys
 Source4:      dsm.opt
@@ -63,12 +63,13 @@ AutoReqProv:  no
     #   unpack the corresponding binary only
     case "%{l_target}" in
         *-freebsd* | *-linux* )
-            %{l_prefix}/bin/tar xf %{SOURCE IP22369.tar}
+            %{l_prefix}/bin/tar xf %{SOURCE IP22508.tar}
             %{l_prefix}/bin/rpm2cpio TIVsm-BA.i386.rpm | cpio -idmu
             mv opt/tivoli/tsm/client root
             ;;
         *-solaris* )
-            %{l_prefix}/bin/gzip -d -c %{SOURCE IP22372.tar.Z} | %{l_prefix}/bin/tar xf -
+            %{l_prefix}/bin/gzip -d -c %{SOURCE IP22502.tar.Z} |\
+            %{l_prefix}/bin/tar xf -
             pkgtrans `pwd`/TIVsmCba.pkg `pwd` TIVsmCba
             mv TIVsmCba/reloc root
             ;;
@@ -99,9 +100,12 @@ AutoReqProv:  no
 
     #   install binaries
     for f in dsmagent dsmc dsmcad dsmstat dsmtca dsmadmc; do
+        file="root/ba/bin/$f"
+        if [ -f "root/admin/bin/$f" ]; then
+            file="root/admin/bin/$f"
+        fi
         %{l_shtool} install -c -m 755 \
-            root/ba/bin/$f \
-            $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
+            $file $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/
         case "%{l_target}" in
             *-freebsd* ) brandelf -t Linux $RPM_BUILD_ROOT%{l_prefix}/libexec/tsmc/$f ;;
         esac