1From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Fri, 10 Mar 2023 03:48:46 +0000
4Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
5
6Error: Transaction test error:
7 file /usr/share/man/man8/dhcpcd.8 conflicts between attempted
8 installs of dhcpcd-doc-9.4.1-r0.cortexa57 and
9 lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon
10
11The differences between the two files are as follows:
12@@ -821,7 +821,7 @@
13 If you always use the same options, put them here.
14 .It Pa /usr/libexec/dhcpcd-run-hooks
15 Bourne shell script that is run to configure or de-configure an interface.
16-.It Pa /usr/lib64/dhcpcd/dev
17+.It Pa /usr/lib/dhcpcd/dev
18 Linux
19 .Pa /dev
20 management modules.
21
22It is just a man file, there is no necessary to manage multiple
23versions.
24
25Upstream-Status: Inappropriate [oe specific]
26Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
27---
28 src/dhcpcd.8.in | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
32index bc6b3b5..791f2ba 100644
33--- a/src/dhcpcd.8.in
34+++ b/src/dhcpcd.8.in
35@@ -821,7 +821,7 @@ Configuration file for dhcpcd.
36 If you always use the same options, put them here.
37 .It Pa @SCRIPT@
38 Bourne shell script that is run to configure or de-configure an interface.
39-.It Pa @LIBDIR@/dhcpcd/dev
40+.It Pa /usr/<libdir>/dhcpcd/dev
41 Linux
42 .Pa /dev
43 management modules.
44--
452.34.1
46
47