- rel 6

[packages/SysVinit.git] / SysVinit.spec

diff --git a/SysVinit.spec b/SysVinit.spec
index 85f24c3dc996eb084b3607fd8d70615321949a80..6f03c5d4af810a9c044a12c8bd5bdbcc41dc9c36 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -14,7 +14,7 @@ Summary(tr):  System V ba
 Summary(uk):   ðÒÏÇÒÁÍÉ, ÝÏ ËÅÒÕÀÔØ ÂÁÚÏ×ÉÍÉ ÓÉÓÔÅÍÎÉÍÉ ÐÒÏÃÅÓÁÍÉ
 Name:          SysVinit
 Version:       2.86
-Release:       1
+Release:       6
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
@@ -34,11 +34,12 @@ Patch8:             sysvinit-pidof.patch
 Patch9:                sysvinit-killall5.patch
 # based on http://www.nsa.gov/selinux/patches/sysvinit-selinux.patch.gz
 Patch10:       sysvinit-selinux.patch
+Patch11:       sysvinit-nopowerstates-single.patch
 %if %{with selinux}
 BuildRequires: libselinux-devel >= 1.18
 BuildRequires: libsepol-devel
 %endif
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.202
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(post):        fileutils
@@ -50,6 +51,7 @@ Requires:     logrotate
 %endif
 Requires:      mingetty
 %{?with_selinux:Requires:      libselinux >= 1.18}
+Obsoletes:     vserver-SysVinit
 Provides:      group(utmp)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -120,6 +122,7 @@ sonlanmalar
 %patch8 -p1
 %patch9 -p1
 %{?with_selinux:%patch10 -p1}
+%patch11 -p1
 
 %build
 %{__make} -C src \
@@ -159,23 +162,17 @@ bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`/usr/bin/getgid utmp`" ]; then
-       if [ "`/usr/bin/getgid utmp`" != 22 ]; then
-               echo "Error: group utmp doesn't have gid=22. Correct this before installing SysVinit." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 22 utmp 1>&2
-fi
+%groupadd -g 22 utmp
 
 %post
-touch %{_sysconfdir}/ioctl.save /var/log/{fail,last}log
+touch %{_sysconfdir}/ioctl.save /var/log/{{fail,last}log,btmpx}
 chmod 000 %{_sysconfdir}/ioctl.save /var/log/{fail,last}log
 chown root:root %{_sysconfdir}/ioctl.save /var/log/faillog
 chown root:utmp /var/log/lastlog
 chmod 600 %{_sysconfdir}/ioctl.save
 chmod 640 /var/log/faillog
 chmod 660 /var/log/lastlog
+chmod 640 /var/log/btmpx
 
 %{_sbindir}/telinit u || :