diff --git a/man-pages.spec b/man-pages.spec index f0a7cbf..28e3a51 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -7,7 +7,7 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages Version: 4.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://www.kernel.org/doc/man-pages/ @@ -20,6 +20,11 @@ Source2: %{additional_name}.tar.xz # attr.5 man page was moved from attr to man-pages in attr-2.4.47-11 Conflicts: attr < 2.4.47-11 +# keyrings.7, persistent-keyring.7, process-keyring.7, session-keyring.7, +# thread-keyring.7, user-keyring.7 and user-session-keyring.7 man pages +# were moved from keyutils-libs to man-pages in keyutils-libs-1.5.10 +Conflicts: keyutils-libs < 1.5.10 + Autoreq: false BuildArch: noarch @@ -78,6 +83,10 @@ popd %{_mandir}/man*/* %changelog +* Wed Mar 15 2017 Nikola Forró - 4.10-2 +- add conflict with keyutils-libs versions containing conflicting man pages + resolves #1432546 + * Wed Mar 15 2017 Nikola Forró - 4.10-1 - update to 4.10 resolves #1432268