- started update to 4.17

[packages/rpm.git] / missing-macros.patch

diff --git a/missing-macros.patch b/missing-macros.patch
index ba9620d96b49ddd1a9a0de0fe7287b3ddc717187..055f9a062fcaaeb8405f157a2850b64b86f9800d 100644 (file)
--- a/missing-macros.patch
+++ b/missing-macros.patch
@@ -7,7 +7,7 @@
 +AC_PATH_PROG(__BASH, bash, /bin/bash, $MYPATH)
  AC_PATH_PROG(__BZIP2, bzip2, /usr/bin/bzip2, $MYPATH)
  AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
- AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
+ AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
 @@ -91,6 +92,7 @@
  AC_PATH_PROG(__UNZIP, unzip, /usr/bin/unzip, $MYPATH)
  AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH)
@@ -17,13 +17,13 @@
  AC_PATH_PROG(__LZIP, lzip, /usr/bin/lzip, $MYPATH)
  AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH)
 @@ -104,6 +106,7 @@
- AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
+ AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
+ AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
  AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
- AC_PATH_PROG(__SEMODULE, semodule, /usr/bin/semodule, $MYPATH)
 +AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH)
- AC_PATH_PROG(__SSH, ssh, /usr/bin/ssh, $MYPATH)
  AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH)
  AC_PATH_PROG(__ZSTD, zstd, /usr/bin/zstd, $MYPATH)
+ 
 --- rpm-4.16.0/macros.in~      2020-11-21 19:41:19.000000000 +0100
 +++ rpm-4.16.0/macros.in       2020-11-22 19:45:24.182620411 +0100
 @@ -6,6 +6,7 @@
@@ -41,7 +41,7 @@
 +%__bash                       @__BASH@
  %__bzip2              @__BZIP2@
  %__cat                        @__CAT@
- %__chgrp              @__CHGRP@
+ %__chmod              @__CHMOD@
 @@ -39,6 +40,7 @@
  %__id                 @__ID@
  %__id_u                       %{__id} -u
@@ -51,10 +51,10 @@
  %__lrzip              @__LRZIP@
  %__lzip                       @__LZIP@
 @@ -54,6 +57,7 @@
- %__rsh                        @__RSH@
+ %__patch              @__PATCH@
+ %__rm                 @__RM@
  %__sed                        @__SED@
- %__semodule           @__SEMODULE@
 +%__sh                 @__SH@
- %__ssh                        @__SSH@
  %__tar                        @__TAR@
  %__unzip              @__UNZIP@
+ %__zstd                       @__ZSTD@