SysVinit: update to 2.88dsf, build tools only

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4097 ec354946-7b23-47d6-9f5a-488ba84defc7

S/SysVinit/SysVinit-vl.spec

@@ -1,27 +1,31 @@
 Summary: Programs which control basic system processes.
 Summary(ja): 基本的なシステムプロセスを制御するプログラム
 Name: SysVinit
-Version: 2.87dsf
+Version: 2.88dsf
 Release: 1%{_dist_release}
 License: GPLv2+
 Group: System Environment/Base
-URL: https://alioth.debian.org/projects/pkg-sysvinit/
-Source: https://alioth.debian.org/frs/download.php/3060/sysvinit-%{version}.tar.gz
+Source: http://download.savannah.gnu.org/releases/sysvinit/sysvinit-%{version}.tar.bz2
+URL: http://savannah.nongnu.org/projects/sysvinit/
 Patch1: sysvinit-2.78-man.patch
 Patch2: sysvinit-2.86-autofsck.patch
 Patch3: sysvinit-2.86-loginshell.patch
 Patch4: sysvinit-2.86-inittab.patch
 Patch5: sysvinit-2.86-single.patch
-Patch6: sysvinit-2.86-quiet.patch
-Patch10: sysvinit-2.87-pidof.patch
-Patch11: sysvinit-2.86-pidof-man.patch
-Patch12: sysvinit-2.87-sulogin.patch
-Patch13: sysvinit-2.87-wide.patch
-Source1: change_console
-Source2: change_console.8
+Patch6: sysvinit-2.88-quiet.patch
+Patch14: sysvinit-2.88-ipv6.patch
+Patch15: sysvinit-2.88-omit.patch
+Patch16: sysvinit-2.88-wall-maxlines.patch
+Patch17: sysvinit-2.88-wall-broadcast-message.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: pam >= 0.66-5
 Requires: %{name}-tools = %{version}-%{release}
+Requires: filesystem
+
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 
 %description
 The SysVinit package contains a group of processes that control
@@ -37,17 +41,21 @@ SysVinit パッケージには，システムの非常に基本的な機能を
 システムの起動や，他のプログラムの起動/終了を制御します．
 
 %package tools
-Summary: Tools used for process and utmp management.
+Summary: Tools used for process management.
+Summary(ja): プロセス管理に使用するツール
 Group: System Environment/Base
 
 %description tools
 The sysvinit-tools package contains various tools used for process
 management.
 
+$description -l ja tools
+SysVinit-tools パッケージにはプロセス管理に使用するさまざまなツール
+が含まれています。
+
 %prep
 %setup -q -n sysvinit-%{version}
-# We use a shell, not sulogin. Other random man fixes go here (such as
-#192804)
+# We use a shell, not sulogin. Other random man fixes go here (such as #192804)
 %patch1 -p1 -b .manpatch
 # Unlink /.autofsck on shutdown -f
 %patch2 -p1 -b .autofsck
@@ -60,68 +68,49 @@ management.
 %patch5 -p1 -b .single
 # Be less verbose when booted with 'quiet'
 %patch6 -p1 -b .quiet
-# Fix various things in pidof - pidof /x/y matching /z/y, pidof -x
-# for scripts, etc.
-%patch10 -p1 -b .pidof
-# Document some of the behavior of pidof. (#201317)
-%patch11 -p1 -b .pidof
-# get_default_context_with_level returns 0 on success (#568530)
-%patch12 -p1 -b .sulogin
-# Add wide output names with -w (#550333)
-%patch13 -p1 -b .wide
+# Change accepted ipv6 addresses (#573346)
+%patch14 -p1 -b .ipv6
+# Add option to pidof to exclude similar processes to omitted processes (#632321)
+%patch15 -p1 -b .omit
+# Fix counting MAXLINES in wall
+%patch16 -p1 -b .maxlines
+# Raise limit for broadcast message
+%patch17 -p1 -b .broadcast
 
 %build
-make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" LDFLAGS="" LCRYPT="-lcrypt" -C src
+make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" LDFLAGS="-lcrypt" -C src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for I in sbin %{_bindir} %{_mandir}/man{1,3,5,8} etc var/run dev %{_includedir}; do
+for I in bin sbin %{_bindir} %{_mandir}/man{1,3,5,8} etc var/run dev %{_includedir}; do
 	mkdir -p $RPM_BUILD_ROOT/$I
 done
-install -d $RPM_BUILD_ROOT/bin
-make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
+make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} STRIP=/bin/true \
 	BIN_OWNER=`id -nu` BIN_GROUP=`id -ng` install
 
-# If this already exists, just do nothing (the ||: part)
-mknod --mode=0600 $RPM_BUILD_ROOT/dev/initctl p ||:
+rm -f $RPM_BUILD_ROOT/bin/pidof
 ln -snf killall5 $RPM_BUILD_ROOT/sbin/pidof
+rm -f $RPM_BUILD_ROOT/sbin/bootlogd
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/bootlogd*
+chmod 755 $RPM_BUILD_ROOT/usr/bin/utmpdump
 
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/utmpdump
+# Remove these files, as we use upstart as /sbin/init.
+rm -f $RPM_BUILD_ROOT/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+rm -f $RPM_BUILD_ROOT/%{_includedir}/initreq.h
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}*
 
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/change_console
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/change_console.8
-install -m 644 src/initreq.h $RPM_BUILD_ROOT%{_includedir}
+# /sbin/fstab-decode is part of initscripts
+rm -f $RPM_BUILD_ROOT/sbin/fstab-decode
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/fstab-decode.8
 
 %post
-[ -e /var/run/initrunlvl ] && ln -s ../var/run/initrunlvl /etc/initrunlvl
 [ -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root ] && /sbin/telinit u
 exit 0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-%defattr(-,root,root)
-%doc doc/Changelog doc/Install COPYRIGHT
-/sbin/halt
-/sbin/init
-/sbin/poweroff
-/sbin/reboot
-/sbin/runlevel
-/sbin/shutdown
-/sbin/telinit
-%{_includedir}/initreq.h
-%attr(2555,root,tty)  %{_bindir}/wall
-%{_mandir}/man5/*
-%{_mandir}/man8/halt*
-%{_mandir}/man8/init*
-%{_mandir}/man8/poweroff*
-%{_mandir}/man8/reboot*
-%{_mandir}/man8/runlevel*
-%{_mandir}/man8/shutdown*
-%{_mandir}/man8/telinit*
-
-
 %files tools
 %defattr(-,root,root)
 %doc doc/Changelog COPYRIGHT
@@ -141,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.88dsf-1
+- update to 2.88dsf
+- only build -tools subpackage
+
 * Fri Apr 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.87dsf-1
 - new upstream release (2.87dsf)
 - remove upstreamed or obsoleted patches