From f517c96d59c61b106cb59b26c3f8582c97768ec2 Mon Sep 17 00:00:00 2001
From: Ivana Hutarova Varekova <varekova@redhat.com>
Date: Wed, 24 Nov 2010 13:10:19 +0100
Subject: [PATCH] - resolves: #655961   add the conflict tag

---
 man-pages.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/man-pages.spec b/man-pages.spec
index 305fc0c..946b9a6 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -4,7 +4,7 @@
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
 Version: 3.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 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
 #Resolves: #647269
 Patch75: man-pages-3.30-prctl.patch
-
+#Resolves: #655961
+Conflicts: quota < 3.17-14
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
 BuildArch: noarch
@@ -126,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %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
 - update to 3.31