- updated selinux patch, fixed pre script, release 5

Changed files:
    SysVinit.spec -> 1.107

diff --git a/SysVinit.spec b/SysVinit.spec
index ea8b759b6c2e0f2ec096dddd402159ef399d57de..ef3479693ba20a5e5312ab72773b05eec6dbfeb5 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -9,7 +9,7 @@ Summary(tr):    System V ba
 Summary(uk):   ðÒÏÇÒÁÍÉ, ÝÏ ËÅÒÕÀÔØ ÂÁÚÏ×ÉÍÉ ÓÉÓÔÅÍÎÉÍÉ ÐÒÏÃÅÓÁÍÉ
 Name:          SysVinit
 Version:       2.85
-Release:       4
+Release:       5
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
@@ -30,14 +30,15 @@ Patch9:             sysvinit-pidof.patch
 Patch10:       sysvinit-log-signals.patch
 Patch11:       sysvinit-killall5.patch
 Patch12:       sysvinit-selinux.patch
-BuildRequires: glibc-devel
 BuildRequires: libselinux-devel
-PreReq:                shadow
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(post):        fileutils
+Requires(postun):      /usr/sbin/groupdel
 Requires:      /bin/awk
 Requires:      login
 Requires:      logrotate
 Requires:      mingetty
-Requires(post):        fileutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
@@ -144,6 +145,14 @@ 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 -r -f utmp
+fi
 groupadd -f -r -g 22 utmp
 
 %post
@@ -159,7 +168,7 @@ chmod 660 /var/log/lastlog
 
 %postun
 if [ "$1" = "0" ]; then
-       groupdel utmp
+       /usr/sbin/groupdel utmp
 fi
 
 %files