]> git.pld-linux.org Git - packages/rpm.git/blame - missing-macros.patch
- merge macros.in patches
[packages/rpm.git] / missing-macros.patch
CommitLineData
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)
10 AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
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)
19--- rpm-4.16.0/macros.in~ 2020-11-21 19:41:19.000000000 +0100
20+++ rpm-4.16.0/macros.in 2020-11-22 19:45:24.182620411 +0100
358b385b
JR
21@@ -6,6 +6,7 @@
22 # should be added to /etc/rpm/macros, while per-user configuration should
23 # be added to ~/.rpmmacros.
24 #
25+%_rpmversion @VERSION@
26
27 #==============================================================================
28 # ---- A macro that expands to nothing.
5da04523
JR
29@@ -25,6 +25,7 @@
30 #
31 %__7zip @__7ZIP@
32 %__awk @AWK@
33+%__bash @__BASH@
34 %__bzip2 @__BZIP2@
35 %__cat @__CAT@
36 %__chgrp @__CHGRP@
37@@ -39,6 +40,7 @@
38 %__id @__ID@
39 %__id_u %{__id} -u
40 %__install @__INSTALL@
41+%__ln @__LN@
42 %__ln_s @LN_S@
43 %__lrzip @__LRZIP@
44 %__lzip @__LZIP@
This page took 0.372878 seconds and 4 git commands to generate.