diff --git a/man-pages.spec b/man-pages.spec index 31c6144..aff134e 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.02 -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/ @@ -17,6 +17,9 @@ Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/%{posix_ # additional man-pages, the source tarball is fedora/rhel only 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 + Autoreq: false BuildArch: noarch @@ -73,6 +76,10 @@ popd %{_mandir}/man*/* %changelog +* Thu Oct 22 2015 Nikola Forró - 4.02-2 +- added conflict with attr versions containing attr.5 man page + resolves #1273702 + * Mon Aug 10 2015 Nikola Forró - 4.02-1 - updated to 4.02 resolves #1251780