checked in (request 32611)

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=31

sysvinit.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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
 

sysvinit.spec

@@ -64,7 +64,6 @@ 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
@@ -73,17 +72,16 @@ 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, powerd, reboot, runlevel, shutdown, and telinit for 
+halt, init, killproc, killall5, powerd, reboot, runlevel, shutdown, and
-more information.
+telinit for more information.
 
-%package tools
-Summary:  Tools for basic booting
-Group: System/Base
 
-%description tools
+
-Helper tools from sysvinit that support booting, including but not exclusive
+Authors:
-to startpar, killproc and pidof. System V init specific programs are in the 
+--------
-sysvinit package.
+    Miquel van Smoorenburg <miquels@drinkel.ow.nl>
+    Florian La Roche <florian@suse.de>
+    Werner Fink <werner@suse.de>
 
 %prep
 %setup -q -b 2 -b 3 -b 4 -b 5
@@ -126,21 +124,21 @@ popd
   CC=gcc
   make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC"
 pushd ../showconsole-%{SCVER}
-  make %{?_smp_mflags}
+  make %{?jobs:-j%jobs};
 popd
 pushd ../killproc-%{KPVER}
-  make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
+  make %{?jobs:-j%jobs} 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 %{?_smp_mflags} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS"
+  make %{?jobs:-j%jobs} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS"
 %endif
 popd
 pushd ../startpar-%{START}
-  make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
+  make %{?jobs:-j%jobs} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
 popd
 
 %install
@@ -206,10 +204,10 @@ popd
 %endif
   chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
 
-%preun tools
+%preun
 %stop_on_removal powered
 
-%post tools
+%post
 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
@@ -219,7 +217,7 @@ if test -x /sbin/mkinitrd_setup; then
     mkinitrd_setup
 fi
 
-%postun tools
+%postun
 %insserv_cleanup
 if test -x /sbin/mkinitrd_setup; then
     mkinitrd_setup
@@ -230,25 +228,6 @@ 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
@@ -268,11 +247,7 @@ 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
@@ -280,6 +255,9 @@ rm -rf ${RPM_BUILD_ROOT}
 /sbin/isserial
 /sbin/checkproc
 /sbin/pidofproc
+/sbin/halt
+/sbin/init
+# /sbin/intr
 /sbin/killproc
 /sbin/killall5
 /sbin/pidof
@@ -287,22 +265,26 @@ 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
-/sbin/startproc
+/usr/bin/last
-/sbin/start_daemon
+/usr/bin/lastb
-/sbin/sulogin
+/usr/bin/utmpdump
+# /usr/include/libblogger.h
+# /usr/lib/libblogger.a
 %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
@@ -312,16 +294,28 @@ 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/startpar.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/vhangup.8.gz
 %doc %{_mandir}/man8/mkill.8.gz
 
-
 %changelog