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