packages: util-linux/util-linux.spec - comment about C: nfs-utils-common < ...

[glen]

Author: glen                         Date: Wed Jan 18 20:55:52 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- comment about C: nfs-utils-common < 1.1.3-3

---- Files affected:
packages/util-linux:
   util-linux.spec (1.335 -> 1.336) 

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.335 packages/util-linux/util-linux.spec:1.336
--- packages/util-linux/util-linux.spec:1.335	Tue Jan 10 16:44:32 2012
+++ packages/util-linux/util-linux.spec	Wed Jan 18 21:55:46 2012
@@ -84,8 +84,8 @@
 		%endif
 	%endif
 %endif
-Requires:	pam >= %{pam_ver}
 Requires:	libblkid = %{version}-%{release}
+Requires:	pam >= %{pam_ver}
 Provides:	fdisk
 Provides:	linux32
 Provides:	sparc32
@@ -99,9 +99,9 @@
 Obsoletes:	util-linux-ng < 2.20-1
 Obsoletes:	util-linux-suids
 Conflicts:	SysVinit < 2.86-26
-Conflicts:	upstart-SysVinit < 2.86-28
 Conflicts:	e2fsprogs < 1.41.8-5
 Conflicts:	shadow-extras < 1:4.0.3-6
+Conflicts:	upstart-SysVinit < 2.86-28
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		debugcflags	-O1 -g
@@ -264,8 +264,9 @@
 Summary(uk.UTF-8):	Програми для монтування та розмонтування файлових систем
 Group:		Applications/System
 Requires:	libmount = %{version}-%{release}
-Conflicts:	nfs-utils-common < 1.1.3-3
 Conflicts:	SysVinit < 2.86-26
+# C: nfs-utils-common is opposite to http://cvs.pld-linux.org/packages/nfs-utils/nfs-utils.spec?r1=1.165&r2=1.166
+Conflicts:	nfs-utils-common < 1.1.3-3
 
 %description -n mount
 mount is used for adding new filesystems, both local and networked, to
@@ -1431,6 +1432,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.336  2012/01/18 20:55:46  glen
+- comment about C: nfs-utils-common < 1.1.3-3
+
 Revision 1.335  2012/01/10 15:44:32  lisu
 - no more separated libtinfo(w)
 - use sed macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.335&r2=1.336&f=u