- quote CC

[packages/SysVinit.git] / SysVinit.spec

diff --git a/SysVinit.spec b/SysVinit.spec
index 49c1148454a6b0548a0528b2bcb3231a0f046fec..934ca4758aef4ce0c4c6a8f2bf9a0026cf9ffc32 100644 (file)
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -8,13 +8,15 @@ Summary(ru):  
 Summary(tr):   System V baþlatma programý
 Summary(uk):   ðÒÏÇÒÁÍÉ, ÝÏ ËÅÒÕÀÔØ ÂÁÚÏ×ÉÍÉ ÓÉÓÔÅÍÎÉÍÉ ÐÒÏÃÅÓÁÍÉ
 Name:          SysVinit
-Version:       2.84
-Release:       4
+Version:       2.85
+Release:       7
 License:       GPL
 Group:         Base
 Source0:       ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
+# Source0-md5: 8a2d8f1ed5a2909da04132fefa44905e
 Source1:       sysvinit.logrotate
 Source2:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2
+# Source2-md5: 9ae8a63a4685368fae19707f95475cca
 Patch0:                sysvinit-paths.patch
 Patch1:                sysvinit-bequiet.patch
 Patch2:                sysvinit-md5-bigendian.patch
@@ -22,13 +24,23 @@ Patch3:             sysvinit-wtmp.patch
 Patch4:                sysvinit-man.patch
 Patch5:                sysvinit-halt.patch
 Patch6:                sysvinit-blowfish.patch
-BuildRequires: glibc-devel
-PreReq:                shadow
+Patch7:                sysvinit-initctl.patch
+Patch8:                sysvinit-autofsck.patch
+Patch9:                sysvinit-pidof.patch
+Patch10:       sysvinit-log-signals.patch
+Patch11:       sysvinit-killall5.patch
+# based on http://www.nsa.gov/selinux/patches/sysvinit-selinux.patch.gz
+Patch12:       sysvinit-selinux.patch
+BuildRequires: libselinux-devel >= 1.14
+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
+Requires:      libselinux >= 1.14
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
@@ -92,9 +104,17 @@ sonlanmalar
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
-%{__make} -C src LCRYPT="-lcrypt" \
+%{__make} -C src \
+       CC="%{__cc}" \
+       LCRYPT="-lcrypt" \
        OPTIMIZE="%{rpmcflags}"
 
 %install
@@ -128,13 +148,20 @@ bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -f -r -g 22 utmp
+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
 
 %post
 touch %{_sysconfdir}/ioctl.save /var/log/{fail,last}log
 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
+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
@@ -143,7 +170,7 @@ chmod 660 /var/log/lastlog
 
 %postun
 if [ "$1" = "0" ]; then
-       groupdel utmp
+       /usr/sbin/groupdel utmp
 fi
 
 %files