X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=SysVinit.spec;h=823d278372275404390b2108aa1ae27df0da96f9;hb=a17726579e42070d897e1c8c66fc1ab24c1890d2;hp=2153a43880ca8973499b3614000f2669db539b52;hpb=05ccae5f5c22217fb7c04580f741ced2c5f44555;p=packages%2FSysVinit.git

diff --git a/SysVinit.spec b/SysVinit.spec
index 2153a43..823d278 100644
--- a/SysVinit.spec
+++ b/SysVinit.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+%bcond_with	preconfigured
+%bcond_without	selinux		# build without SELinux support
+#
 Summary:	System V initialization program
 Summary(de):	System V-Intialisierungsprogramm
 Summary(es):	Programa de inicialización System V
@@ -8,15 +13,15 @@ Summary(ru):	
 Summary(tr):	System V baþlatma programý
 Summary(uk):	ðÒÏÇÒÁÍÉ, ÝÏ ËÅÒÕÀÔØ ÂÁÚÏ×ÉÍÉ ÓÉÓÔÅÍÎÉÍÉ ÐÒÏÃÅÓÁÍÉ
 Name:		SysVinit
-Version:	2.85
+Version:	2.86
 Release:	1
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
-# Source0-md5: 8a2d8f1ed5a2909da04132fefa44905e
+# Source0-md5:	7d5d61c026122ab791ac04c8a84db967
 Source1:	sysvinit.logrotate
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/sysvinit-non-english-man-pages.tar.bz2
-# Source2-md5: 9ae8a63a4685368fae19707f95475cca
+# Source2-md5:	9ae8a63a4685368fae19707f95475cca
 Patch0:		sysvinit-paths.patch
 Patch1:		sysvinit-bequiet.patch
 Patch2:		sysvinit-md5-bigendian.patch
@@ -24,16 +29,33 @@ Patch3:		sysvinit-wtmp.patch
 Patch4:		sysvinit-man.patch
 Patch5:		sysvinit-halt.patch
 Patch6:		sysvinit-blowfish.patch
-BuildRequires:	glibc-devel
-PreReq:		shadow
+Patch7:		sysvinit-autofsck.patch
+Patch8:		sysvinit-pidof.patch
+Patch9:		sysvinit-killall5.patch
+# based on http://www.nsa.gov/selinux/patches/sysvinit-selinux.patch.gz
+Patch10:	sysvinit-selinux.patch
+%if %{with selinux}
+BuildRequires:	libselinux-devel >= 1.18
+BuildRequires:	libsepol-devel
+%endif
+BuildRequires:	rpmbuild(macros) >= 1.202
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(post):	fileutils
+Requires(postun):	/usr/sbin/groupdel
 Requires:	/bin/awk
 Requires:	login
+%if %{with preconfigured}
 Requires:	logrotate
+%endif
 Requires:	mingetty
-Requires(post):	fileutils
+%{?with_selinux:Requires:	libselinux >= 1.18}
+Provides:	group(utmp)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
+# as in original flags
+%define		specflags	-fomit-frame-pointer
 
 %description
 The SysVinit package contains a group of processes that control the
@@ -94,15 +116,22 @@ sonlanmalar
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%{?with_selinux:%patch10 -p1}
 
 %build
-%{__make} -C src LCRYPT="-lcrypt" \
-	OPTIMIZE="%{rpmcflags}"
+%{__make} -C src \
+	CC="%{__cc}" \
+	LCRYPT="-lcrypt" \
+	OPTIMIZE="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8}} \
-	$RPM_BUILD_ROOT{%{_sysconfdir},/etc/logrotate.d,/var/log}
+install -d $RPM_BUILD_ROOT{/bin,%{_bindir},%{_sbindir},%{_mandir}/man{1,5,8}} \
+	$RPM_BUILD_ROOT{%{_includedir},%{_sysconfdir},/etc/logrotate.d,/var/log}
 
 %{__make} install -C src \
 	ROOT=$RPM_BUILD_ROOT \
@@ -130,13 +159,13 @@ bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-groupadd -f -r -g 22 utmp
+%groupadd -g 22 utmp
 
 %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
@@ -145,13 +174,14 @@ chmod 660 /var/log/lastlog
 
 %postun
 if [ "$1" = "0" ]; then
-	groupdel utmp
+	%groupremove utmp
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc doc/{Propaganda,Changelog,*.lsm}
 
+%attr(755,root,root) /bin/mountpoint
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/last
 %attr(755,root,root) %{_bindir}/lastb
@@ -178,3 +208,6 @@ fi
 %lang(ja) %{_mandir}/ja/man[158]/*
 %lang(ko) %{_mandir}/ko/man[158]/*
 %lang(pl) %{_mandir}/pl/man[158]/*
+
+# devel?
+#%{_includedir}/initreq.h