[packages/man-pages] - resolve conflict with keyutils-devel

qboosh qboosh at pld-linux.org
Mon Mar 27 20:41:01 CEST 2017


commit 3d3fd98a1db1d154be012c09f8a382f6c9c34569
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 27 20:40:54 2017 +0200

    - resolve conflict with keyutils-devel

 man-pages.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/man-pages.spec b/man-pages.spec
index 7ef5fa4..f49d794 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -535,6 +535,8 @@ grep '^man' glibc-man.list | sed -e "s,^,$RPM_BUILD_ROOT%{_mandir}/," | xargs -r
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/{aio_init,lio_listio}.3
 # shadow (but not pwdutils!); shadow(5) is missing in pwdutils too
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/passwd.5
+# keyutils-devel
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/{keyrings,persistent-keyring,process-keyring,session-keyring,thread-keyring,user-keyring,user-session-keyring}.7
 
 # install localized man pages, only for installed C man pages
 for l in %{man_langs} ; do
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/man-pages.git/commitdiff/3d3fd98a1db1d154be012c09f8a382f6c9c34569



More information about the pld-cvs-commit mailing list