projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 5da04523 JR |
1 | --- rpm-4.16.0/configure.ac~ 2020-11-22 19:47:14.000000000 +0100 |
| 2 | +++ rpm-4.16.0/configure.ac 2020-11-22 19:49:03.093877834 +0100 | |
| 3 | @@ -76,6 +76,7 @@ | |
| 4 | dnl Find some common programs | |
| 5 | dnl | |
| 6 | AC_PATH_PROGS(__7ZIP, [7zip 7za 7z], /usr/bin/7za, $MYPATH) | |
| 7 | +AC_PATH_PROG(__BASH, bash, /bin/bash, $MYPATH) | |
| 8 | AC_PATH_PROG(__BZIP2, bzip2, /usr/bin/bzip2, $MYPATH) | |
| 9 | AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH) | |
| 4d1423dd | 10 | AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH) |
| 5da04523 JR |
11 | @@ -91,6 +92,7 @@ |
| 12 | AC_PATH_PROG(__UNZIP, unzip, /usr/bin/unzip, $MYPATH) | |
| 13 | AC_PATH_PROG(__ID, id, /usr/bin/id, $MYPATH) | |
| 14 | AC_PATH_PROG(__INSTALL, install, /usr/bin/install, $MYPATH) | |
| 15 | +AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH) | |
| 16 | AC_PATH_PROG(__LRZIP, lrzip, /usr/bin/lrzip, $MYPATH) | |
| 17 | AC_PATH_PROG(__LZIP, lzip, /usr/bin/lzip, $MYPATH) | |
| 18 | AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH) | |
| 3496aedb | 19 | @@ -104,6 +106,7 @@ |
| 4d1423dd JR |
20 | AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH) |
| 21 | AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH) | |
| 3496aedb | 22 | AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH) |
| 3496aedb | 23 | +AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH) |
| 3496aedb JP |
24 | AC_PATH_PROG(__TAR, tar, /bin/tar, $MYPATH) |
| 25 | AC_PATH_PROG(__ZSTD, zstd, /usr/bin/zstd, $MYPATH) | |
| 4d1423dd | 26 | |
| 5da04523 JR |
27 | --- rpm-4.16.0/macros.in~ 2020-11-21 19:41:19.000000000 +0100 |
| 28 | +++ rpm-4.16.0/macros.in 2020-11-22 19:45:24.182620411 +0100 | |
| 358b385b JR |
29 | @@ -6,6 +6,7 @@ |
| 30 | # should be added to /etc/rpm/macros, while per-user configuration should | |
| 31 | # be added to ~/.rpmmacros. | |
| 32 | # | |
| 33 | +%_rpmversion @VERSION@ | |
| 34 | ||
| 35 | #============================================================================== | |
| 36 | # ---- A macro that expands to nothing. | |
| 5da04523 JR |
37 | @@ -25,6 +25,7 @@ |
| 38 | # | |
| 39 | %__7zip @__7ZIP@ | |
| 40 | %__awk @AWK@ | |
| 41 | +%__bash @__BASH@ | |
| 42 | %__bzip2 @__BZIP2@ | |
| 43 | %__cat @__CAT@ | |
| 4d1423dd | 44 | %__chmod @__CHMOD@ |
| 5da04523 JR |
45 | @@ -39,6 +40,7 @@ |
| 46 | %__id @__ID@ | |
| 47 | %__id_u %{__id} -u | |
| 48 | %__install @__INSTALL@ | |
| 49 | +%__ln @__LN@ | |
| 50 | %__ln_s @LN_S@ | |
| 51 | %__lrzip @__LRZIP@ | |
| 52 | %__lzip @__LZIP@ | |
| 3496aedb | 53 | @@ -54,6 +57,7 @@ |
| 4d1423dd JR |
54 | %__patch @__PATCH@ |
| 55 | %__rm @__RM@ | |
| 3496aedb | 56 | %__sed @__SED@ |
| 3496aedb | 57 | +%__sh @__SH@ |
| 3496aedb JP |
58 | %__tar @__TAR@ |
| 59 | %__unzip @__UNZIP@ | |
| 4d1423dd | 60 | %__zstd @__ZSTD@ |