packages: man/man.spec - conflicts with man-db; rel. 2

[kiesiu]

Author: kiesiu                       Date: Wed Feb 29 20:00:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflicts with man-db; rel. 2

---- Files affected:
packages/man:
   man.spec (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: packages/man/man.spec
diff -u packages/man/man.spec:1.158 packages/man/man.spec:1.159
--- packages/man/man.spec:1.158	Sat Jan 29 01:06:58 2011
+++ packages/man/man.spec	Wed Feb 29 21:00:15 2012
@@ -13,7 +13,7 @@
 Summary(uk.UTF-8):	Набір утиліт для документації: man, apropos та whatis
 Name:		man
 Version:	1.6g
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz
@@ -67,6 +67,7 @@
 Obsoletes:	man-pl
 Obsoletes:	man-pt
 Obsoletes:	man-sl
+Conflicts:	man-db
 Conflicts:	tmpwatch < 2.9.6-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -161,6 +162,7 @@
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
+Conflicts:	man-db
 
 %description whatis
 This package provides the following utilities: apropos, whatis and
@@ -558,6 +560,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.159  2012/02/29 20:00:15  kiesiu
+- conflicts with man-db; rel. 2
+
 Revision 1.158  2011/01/29 00:06:58  sparky
 - dropped pre-cvs changelog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/man/man.spec?r1=1.158&r2=1.159&f=u