rpms/man-db/devel man-db.spec,1.1,1.2

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/man-db/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27625

Modified Files:
	man-db.spec 
Log Message:
 - add conflicts tag




Index: man-db.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man-db/devel/man-db.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- man-db.spec	15 Apr 2010 12:53:38 -0000	1.1
+++ man-db.spec	16 Apr 2010 08:40:02 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Database cached manual pager suite
 Name: man-db
 Version: 2.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # project man-db  GPLv2+
 # Gnulib part     GPLv3+
 License: GPLv2+ and GPLv3+
@@ -16,6 +16,7 @@ Source2: man-db.sysconfig
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: man < 2.0
 Provides: man-pages-reader
+Conflicts: man
 Requires: less, coreutils, grep, groff, gzip, crontabs
 BuildRequires: gdbm-devel, groff, gettext
 
@@ -103,5 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja)   %{_datadir}/man/ja/man*/*
 
 %changelog
+* Fri Apr 16 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 2.5.7-2
+- add conflicts tag
+
 * Wed Feb 17 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 2.5.7-1
 - initial build