packages: util-linux/util-linux.spec - moved mountpoint from SysVinit packa...

[glen]

Author: glen                         Date: Mon Sep  5 15:36:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved mountpoint from SysVinit package; rel 5

---- Files affected:
packages/util-linux:
   util-linux.spec (1.317 -> 1.318) 

---- Diffs:

================================================================
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.317 packages/util-linux/util-linux.spec:1.318
--- packages/util-linux/util-linux.spec:1.317	Mon Sep  5 12:19:15 2011
+++ packages/util-linux/util-linux.spec	Mon Sep  5 17:36:50 2011
@@ -31,7 +31,7 @@
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
 Version:	2.20
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2
@@ -95,6 +95,8 @@
 Obsoletes:	sparc32
 Obsoletes:	util-linux-ng <= %{version}-%{release}
 Obsoletes:	util-linux-suids
+Conflicts:	SysVinit < 2.86-26
+Conflicts:	upstart-SysVinit < 2.86-26
 Conflicts:	e2fsprogs < 1.41.8-5
 Conflicts:	shadow-extras < 1:4.0.3-6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -871,6 +873,8 @@
 %attr(755,root,root) /bin/dmesg
 %attr(755,root,root) /bin/kill
 %attr(755,root,root) /bin/more
+%attr(755,root,root) /bin/mountpoint
+
 %attr(755,root,root) /sbin/ctrlaltdel
 %if %{with partx}
 %attr(755,root,root) /sbin/addpart
@@ -952,6 +956,7 @@
 %{_mandir}/man1/lscpu.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/more.1*
+%{_mandir}/man1/mountpoint.1*
 %{_mandir}/man1/namei.1*
 %{_mandir}/man1/pg.1*
 %{_mandir}/man1/readprofile.1*
@@ -1230,14 +1235,11 @@
 %files -n mount
 %defattr(644,root,root,755)
 %attr(4755,root,root) /bin/mount
-#%attr(755,root,root) /bin/mountpoint
 %attr(4755,root,root) /bin/umount
 %attr(755,root,root) /sbin/pivot_root
 %attr(755,root,root) /sbin/swapon
 %attr(755,root,root) /sbin/swapoff
 
-#%{_mandir}/man1/mountpoint.1*
-
 %{_mandir}/man5/fstab.5*
 
 %{_mandir}/man8/mount.8*
@@ -1432,6 +1434,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.318  2011/09/05 15:36:50  glen
+- moved mountpoint from SysVinit package; rel 5
+
 Revision 1.317  2011/09/05 10:19:15  glen
 - different cachefile for initrd build
 
================================================================

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