diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index d7b1145bc5..5604cb9037 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2b1a3f900f15034943fc41661eaab41bcc0d4d84 Mon Sep 17 00:00:00 2001 | 1 | From c82c19dc583843b1a975f2e3f2e151656a6f377c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
4 | Subject: [PATCH 06/15] Do not hardcode "lib/rpm" as the installation path for | 4 | Subject: [PATCH 06/14] Do not hardcode "lib/rpm" as the installation path for |
5 | default configuration and macros. | 5 | default configuration and macros. |
6 | 6 | ||
7 | Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] | 7 | Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 373d69484..c04a2e8d1 100644 | 17 | index 7155d9f00..21b95ae5f 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -1038,7 +1038,7 @@ else | 20 | @@ -1047,7 +1047,7 @@ else |
21 | usrprefix=$prefix | 21 | usrprefix=$prefix |
22 | fi | 22 | fi |
23 | 23 | ||
@@ -27,7 +27,7 @@ index 373d69484..c04a2e8d1 100644 | |||
27 | 27 | ||
28 | AC_SUBST(OBJDUMP) | 28 | AC_SUBST(OBJDUMP) |
29 | diff --git a/macros.in b/macros.in | 29 | diff --git a/macros.in b/macros.in |
30 | index 3f8dbba61..da4812540 100644 | 30 | index d08624856..68a972f1e 100644 |
31 | --- a/macros.in | 31 | --- a/macros.in |
32 | +++ b/macros.in | 32 | +++ b/macros.in |
33 | @@ -954,7 +954,7 @@ package or when debugging this package.\ | 33 | @@ -954,7 +954,7 @@ package or when debugging this package.\ |
@@ -40,7 +40,7 @@ index 3f8dbba61..da4812540 100644 | |||
40 | %_infodir %{_datadir}/info | 40 | %_infodir %{_datadir}/info |
41 | %_mandir %{_datadir}/man | 41 | %_mandir %{_datadir}/man |
42 | diff --git a/rpm.am b/rpm.am | 42 | diff --git a/rpm.am b/rpm.am |
43 | index f0df0202f..37205a5eb 100644 | 43 | index 51225892d..e0c834d37 100644 |
44 | --- a/rpm.am | 44 | --- a/rpm.am |
45 | +++ b/rpm.am | 45 | +++ b/rpm.am |
46 | @@ -1,10 +1,10 @@ | 46 | @@ -1,10 +1,10 @@ |
@@ -55,7 +55,7 @@ index f0df0202f..37205a5eb 100644 | |||
55 | +rpmconfigdir = $(libdir)/rpm | 55 | +rpmconfigdir = $(libdir)/rpm |
56 | 56 | ||
57 | # Libtool version (current-revision-age) for all our libraries | 57 | # Libtool version (current-revision-age) for all our libraries |
58 | rpm_version_info = 8:0:0 | 58 | rpm_version_info = 8:1:0 |
59 | -- | 59 | -- |
60 | 2.14.2 | 60 | 2.15.1 |
61 | 61 | ||