X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=missing-macros.patch;h=ba9620d96b49ddd1a9a0de0fe7287b3ddc717187;hp=5b402549096bbcb8ed71f3ec2a667966ddc4dd5e;hb=d9f3db8;hpb=5da04523d2bcb0a699dd325189eb29c774c8e69c diff --git a/missing-macros.patch b/missing-macros.patch index 5b40254..ba9620d 100644 --- a/missing-macros.patch +++ b/missing-macros.patch @@ -16,8 +16,24 @@ AC_PATH_PROG(__LRZIP, lrzip, /usr/bin/lrzip, $MYPATH) 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(__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 @@ + # should be added to /etc/rpm/macros, while per-user configuration should + # be added to ~/.rpmmacros. + # ++%_rpmversion @VERSION@ + + #============================================================================== + # ---- A macro that expands to nothing. @@ -25,6 +25,7 @@ # %__7zip @__7ZIP@ @@ -34,3 +50,11 @@ %__ln_s @LN_S@ %__lrzip @__LRZIP@ %__lzip @__LZIP@ +@@ -54,6 +57,7 @@ + %__rsh @__RSH@ + %__sed @__SED@ + %__semodule @__SEMODULE@ ++%__sh @__SH@ + %__ssh @__SSH@ + %__tar @__TAR@ + %__unzip @__UNZIP@