packages: SysVinit/SysVinit.spec - moved mountpoint to util-linux package; ...

[glen]

Author: glen                         Date: Mon Sep  5 15:41:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved mountpoint to util-linux package; rel 26

---- Files affected:
packages/SysVinit:
   SysVinit.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: packages/SysVinit/SysVinit.spec
diff -u packages/SysVinit/SysVinit.spec:1.155 packages/SysVinit/SysVinit.spec:1.156
--- packages/SysVinit/SysVinit.spec:1.155	Wed Jun 15 11:42:25 2011
+++ packages/SysVinit/SysVinit.spec	Mon Sep  5 17:41:47 2011
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8):	Програми, що керують базовими системними процесами
 Name:		SysVinit
 Version:	2.86
-Release:	25
+Release:	26
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
@@ -52,7 +52,6 @@
 BuildRequires:	libsepol-devel
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.202
-Requires(post):	fileutils
 Requires(postun):	/usr/sbin/groupdel
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -60,11 +59,12 @@
 %{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	login
 Requires:	mingetty
+Requires:	util-linux >= 2.20-5
 Provides:	group(utmp)
 Provides:	virtual(init-daemon)
+Obsoletes:	upstart-SysVinit
 Obsoletes:	virtual(init-daemon)
 Obsoletes:	vserver-SysVinit
-Obsoletes:	upstart-SysVinit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
@@ -187,6 +187,9 @@
 
 cp -a man/intl/* $RPM_BUILD_ROOT%{_mandir}
 
+# in util-linux
+rm $RPM_BUILD_ROOT{/bin/mountpoint,%{_mandir}/man1/mountpoint.1*}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -220,7 +223,6 @@
 %defattr(644,root,root,755)
 %doc doc/{Propaganda,Changelog,*.lsm} src/initscript.sample
 
-%attr(755,root,root) /bin/mountpoint
 %attr(755,root,root) /bin/pidof
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/last
@@ -262,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2011/09/05 15:41:47  glen
+- moved mountpoint to util-linux package; rel 26
+
 Revision 1.155  2011/06/15 09:42:25  arekm
 - rel 25; O: upstart-SysVinit directly
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SysVinit/SysVinit.spec?r1=1.155&r2=1.156&f=u