Accepting request 32195 from home:coolo:branches:openSUSE:Factory

Copy from home:coolo:branches:openSUSE:Factory/sysvinit via accept of submit request 32195 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/32195
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=30
This commit is contained in:
Dr. Werner Fink 2010-02-15 14:14:27 +00:00 committed by Git OBS Bridge
parent 5a69badb3b
commit b5a3ab6cd7
2 changed files with 57 additions and 45 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 11 13:36:19 UTC 2010 - coolo@novell.com
- Split out tools not specific to System V into a tool subpackage
to support alternative init implementations (fate#305690)
-------------------------------------------------------------------
Mon Feb 8 15:58:56 CET 2010 - werner@suse.de

View File

@ -64,6 +64,7 @@ Patch17: sysvinit-2.86-hddown.patch
Patch18: sysvinit-2.86-selinux.patch
Patch19: sysvinit-2.86-fuse-no-kill.patch
Patch20: sysvinit-2.86-mdmon-no-kill.patch
Requires: sysvinit-tools
%description
System V style init programs by Miquel van Smoorenburg that control the
@ -72,16 +73,17 @@ runlevels, each one associated with a specific set of utilities. For
example, the normal system runlevel is 3, which starts a getty on
virtual consoles tty1-tty6. Runlevel 5 starts xdm. Runlevel 0 shuts
down the system. See the individual man pages for inittab, initscript,
halt, init, killproc, killall5, powerd, reboot, runlevel, shutdown, and
telinit for more information.
halt, init, powerd, reboot, runlevel, shutdown, and telinit for
more information.
%package tools
Summary: Tools for basic booting
Group: System/Base
Authors:
--------
Miquel van Smoorenburg <miquels@drinkel.ow.nl>
Florian La Roche <florian@suse.de>
Werner Fink <werner@suse.de>
%description tools
Helper tools from sysvinit that support booting, including but not exclusive
to startpar, killproc and pidof. System V init specific programs are in the
sysvinit package.
%prep
%setup -q -b 2 -b 3 -b 4 -b 5
@ -124,21 +126,21 @@ popd
CC=gcc
make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC"
pushd ../showconsole-%{SCVER}
make %{?jobs:-j%jobs};
make %{?_smp_mflags}
popd
pushd ../killproc-%{KPVER}
make %{?jobs:-j%jobs} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
popd
pushd ../powerd-%{PDVER}
%ifnarch s390 s390x
./configure --prefix= --bindir='$(DESTDIR)/sbin' \
--mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin'
make %{?jobs:-j%jobs} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS"
make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS"
%endif
popd
pushd ../startpar-%{START}
make %{?jobs:-j%jobs} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
popd
%install
@ -204,10 +206,10 @@ popd
%endif
chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
%preun
%preun tools
%stop_on_removal powered
%post
%post tools
if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build ; then
if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then
/sbin/telinit u
@ -217,7 +219,7 @@ if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
fi
%postun
%postun tools
%insserv_cleanup
if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup
@ -228,6 +230,25 @@ rm -rf ${RPM_BUILD_ROOT}
%files
%defattr (-,root,root,755)
/sbin/halt
/sbin/init
/sbin/poweroff
/sbin/reboot
/sbin/runlevel
/sbin/shutdown
/sbin/telinit
%doc %{_mandir}/man8/halt.8.gz
%doc %{_mandir}/man5/initscript.5.gz
%doc %{_mandir}/man5/inittab.5.gz
%doc %{_mandir}/man8/init.8.gz
%doc %{_mandir}/man8/poweroff.8.gz
%doc %{_mandir}/man8/reboot.8.gz
%doc %{_mandir}/man8/runlevel.8.gz
%doc %{_mandir}/man8/shutdown.8.gz
%doc %{_mandir}/man8/telinit.8.gz
%files tools
%defattr (-,root,root,755)
%ifnarch s390 s390x
%config /etc/powerd.conf
%config /etc/init.d/powerd
@ -247,7 +268,11 @@ rm -rf ${RPM_BUILD_ROOT}
/bin/pidof
/bin/usleep
/bin/fsync
/usr/bin/last
/usr/bin/lastb
/usr/bin/utmpdump
# /sbin/bootlogd
# /sbin/intr
/sbin/blogger
/sbin/blogd
/sbin/showconsole
@ -255,9 +280,6 @@ rm -rf ${RPM_BUILD_ROOT}
/sbin/isserial
/sbin/checkproc
/sbin/pidofproc
/sbin/halt
/sbin/init
# /sbin/intr
/sbin/killproc
/sbin/killall5
/sbin/pidof
@ -265,26 +287,22 @@ rm -rf ${RPM_BUILD_ROOT}
/sbin/powerd
/sbin/detectups
%endif
/sbin/poweroff
/sbin/reboot
/sbin/runlevel
/sbin/startproc
/sbin/start_daemon
/sbin/shutdown
/sbin/sulogin
/sbin/telinit
/sbin/startpar
/sbin/vhangup
/sbin/mkill
/usr/bin/last
/usr/bin/lastb
/usr/bin/utmpdump
# /usr/include/libblogger.h
# /usr/lib/libblogger.a
/sbin/startproc
/sbin/start_daemon
/sbin/sulogin
%doc %{_mandir}/man1/last.1.gz
%doc %{_mandir}/man1/lastb.1.gz
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
%ifnarch s390 s390x
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
%endif
# /usr/include/libblogger.h
# /usr/lib/libblogger.a
%doc %{_mandir}/man1/mountpoint.1.gz
# %doc %{_mandir}/man8/bootlogd.8.gz
%doc %{_mandir}/man8/blogger.8.gz
@ -294,28 +312,16 @@ rm -rf ${RPM_BUILD_ROOT}
%doc %{_mandir}/man8/isserial.8.gz
%doc %{_mandir}/man8/checkproc.8.gz
%doc %{_mandir}/man8/pidofproc.8.gz
%doc %{_mandir}/man8/halt.8.gz
%doc %{_mandir}/man5/initscript.5.gz
%doc %{_mandir}/man5/inittab.5.gz
%doc %{_mandir}/man8/init.8.gz
#%doc %{_mandir}/man8/intr.8.gz
%doc %{_mandir}/man8/killall5.8.gz
%doc %{_mandir}/man8/killproc.8.gz
%doc %{_mandir}/man8/pidof.8.gz
%ifnarch s390 s390x
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
%endif
%doc %{_mandir}/man8/poweroff.8.gz
%doc %{_mandir}/man8/reboot.8.gz
%doc %{_mandir}/man8/runlevel.8.gz
%doc %{_mandir}/man8/startproc.8.gz
%doc %{_mandir}/man8/start_daemon.8.gz
%doc %{_mandir}/man8/shutdown.8.gz
%doc %{_mandir}/man8/sulogin.8.gz
%doc %{_mandir}/man8/telinit.8.gz
%doc %{_mandir}/man8/startpar.8.gz
%doc %{_mandir}/man8/sulogin.8.gz
%doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz
%changelog