Преглед изворни кода

reduce external dependencies to tools already present in bootstrap

Ralf S. Engelschall пре 23 година
родитељ
комит
81658b16db
3 измењених фајлова са 15 додато и 17 уклоњено
  1. 6 8
      pgp/pgp.spec
  2. 4 4
      pgp2/pgp2.spec
  3. 5 5
      sav/sav.spec

+ 6 - 8
pgp/pgp.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        Cryptography
 License:      GPL
 Version:      %{V_long}
-Release:      20021010
+Release:      20021122
 
 #   list of sources
 Source0:      ftp://ftp.pgpi.org/pub/pgp/%{V_short}/%{V_long}/pgpsrc%{V_strip}unix.tar.gz
@@ -46,8 +46,8 @@ Patch0:       pgpsrc%{V_strip}unix.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, patch, gzip, tar
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021120
+PreReq:       OpenPKG, openpkg >= 20021120
 AutoReq:      no
 AutoReqProv:  no
 
@@ -58,12 +58,10 @@ AutoReqProv:  no
 %prep
     %setup -c -n pgp-%{V_long}
     rm -rf pgpsrc pgp-%{V_long}
-    %{l_prefix}/bin/gzip -d -c %{SOURCE pgpsrc%{V_strip}unix.tar.gz} |\
-        %{l_prefix}/bin/tar xf -
-    %{l_prefix}/bin/gzip -d -c pgpsrc%{V_strip}unix.tar.gz |\
-        %{l_prefix}/bin/tar xf -
+    %{l_gzip} -d -c %{SOURCE pgpsrc%{V_strip}unix.tar.gz} | %{l_tar} xf -
+    %{l_gzip} -d -c pgpsrc%{V_strip}unix.tar.gz | %{l_tar} xf -
     cd pgpsrc
-    %{l_prefix}/bin/patch -p0 <%{SOURCE pgpsrc%{V_strip}unix.patch}
+    %{l_patch} -p0 <%{SOURCE pgpsrc%{V_strip}unix.patch}
 
 %build
     cd pgpsrc

+ 4 - 4
pgp2/pgp2.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Cryptography
 License:      GPL
 Version:      %{V_long}
-Release:      20020629
+Release:      20021122
 
 #   list of sources
 Source0:      ftp://ftp.pgpi.org/pub/pgp/%{V_short}/src/pgp%{V_strip}is.tar.gz
@@ -48,8 +48,8 @@ Patch1:       system.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, tar, gcc
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021120, gcc
+PreReq:       OpenPKG, openpkg >= 20021120
 AutoReq:      no
 AutoReqProv:  no
 
@@ -71,7 +71,7 @@ AutoReqProv:  no
 %prep
     #   extract distribution
     %setup -c -n pgp-%{V_long}
-    %{l_prefix}/bin/tar -xf pgp%{V_strip}ii.tar
+    %{l_tar} -xf pgp%{V_strip}ii.tar
     %patch0 -p0
     %patch1 -p0
 

+ 5 - 5
sav/sav.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [PRIV]
 Group:        Filesystem
 License:      Commercial/Free-Trail
 Version:      %{V_full}
-Release:      20020324
+Release:      20021122
 
 #   list of sources
 Source0:      http://www.sophos.com/downloads/ide/%{V_short}_ides.zip
@@ -50,8 +50,8 @@ Source5:      freebsd.libc.so.3
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, gzip, tar, infozip, bash
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20021120, infozip
+PreReq:       OpenPKG, openpkg >= 20021120
 AutoReq:      no
 AutoReqProv:  no
 
@@ -69,7 +69,7 @@ AutoReqProv:  no
         *-solaris* ) engine="%{SOURCE3}" ;;
         * ) echo "Sorry, platform %{l_target} not supported" 1>&2; exit 1 ;;
     esac
-    %{l_prefix}/bin/gzip -d -c $engine | %{l_prefix}/bin/tar xf -
+    %{l_gzip} -d -c $engine | %{l_tar} xf -
     ( mkdir ides; cd ides;
       %{l_prefix}/bin/unzip -x %{SOURCE0}
     )
@@ -88,7 +88,7 @@ AutoReqProv:  no
     ( cd sav-install
       chmod u+w install.sh
       %{l_shtool} subst -e 's;chown;true;g' -e 's;chgrp;true;g' install.sh
-      %{l_prefix}/bin/bash install.sh -readytogo -v \
+      %{l_bash} install.sh -readytogo -v \
           -d $RPM_BUILD_ROOT%{l_prefix} \
           -b $RPM_BUILD_ROOT%{l_prefix}/libexec/sav \
           -l $RPM_BUILD_ROOT%{l_prefix}/libexec/sav \