rpms/man-pages
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- resolves: #655961

Browse Source 
add the conflict tag
This commit is contained in:
Ivana Hutarova Varekova 2010-11-24 13:10:19 +01:00
parent fc9859dd08
commit f517c96d59
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man-pages.spec
View File

@ -4,7 +4,7 @@
Summary: Man (manual) pages from the Linux Documentation Project Summary: Man (manual) pages from the Linux Documentation Project
Name: man-pages Name: man-pages
Version: 3.31 Version: 3.31
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
Group: Documentation Group: Documentation
URL: http://www.kernel.org/pub/linux/docs/manpages/ URL: http://www.kernel.org/pub/linux/docs/manpages/
@ -36,7 +36,8 @@ Patch73: man-pages-posix-2003-printf.patch
Patch74: man-pages-3.30-open.patch Patch74: man-pages-3.30-open.patch
#Resolves: #647269 #Resolves: #647269
Patch75: man-pages-3.30-prctl.patch Patch75: man-pages-3.30-prctl.patch
#Resolves: #655961
Conflicts: quota < 3.17-14
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Autoreq: false Autoreq: false
BuildArch: noarch BuildArch: noarch
@ -126,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
%lang(en) %{_mandir}/en/man*/* %lang(en) %{_mandir}/en/man*/*
%changelog %changelog
* Wed Nov 24 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.31-2
- resolves: #655961
add the conflict tag
* Fri Nov 19 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.31-1 * Fri Nov 19 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.31-1
- update to 3.31 - update to 3.31