rpms/sysvinit/devel sysvinit.spec,1.63,1.64

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13671

Modified Files:
	sysvinit.spec 
Log Message:
revert upstart changes for now - they need to go on a branch



Index: sysvinit.spec
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sysvinit.spec	6 Feb 2008 20:54:45 -0000	1.63
+++ sysvinit.spec	15 Feb 2008 22:09:33 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
 Version: 2.86
-Release: 19
+Release: 20
 License: GPLv2+
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -33,7 +33,6 @@
 Requires: pam >= 0.66-5
 Requires: filesystem >= 2.2.4-1
 Requires: libselinux >= 1.21.10-1 libsepol >= 1.3.5
-Requires: sysvinit-tools = %{version}-%{release}
 Obsoletes: SysVinit < 2.86-17
 Provides: SysVinit = %{version}-%{release}
 BuildRequires: libselinux-devel >= 1.21.10-1 libsepol-devel >= 1.3.5
@@ -45,14 +44,6 @@
 system boots. Init then controls the startup, running, and shutdown
 of all other programs.
 
-%package tools
-Summary: Tools used for process and utmp management.
-Group: System Environment/Base
-
-%description tools
-The sysvinit-tools package contains various tools used for process
-management.
-
 %prep
 %setup -q -n sysvinit-%{version}
 # We use a shell, not sulogin. Other random man fixes go here (such as #192804)
@@ -134,40 +125,26 @@
 /bin/mountpoint
 /sbin/halt
 /sbin/init
+/sbin/killall5
+/sbin/pidof
 /sbin/poweroff
 /sbin/reboot
 /sbin/runlevel
 /sbin/shutdown
+/sbin/sulogin
 /sbin/telinit
 /sbin/change_console
+/usr/bin/last
+/usr/bin/lastb
+/usr/bin/mesg
+/usr/bin/utmpdump
 %attr(2555,root,tty)  /usr/bin/wall
 %{_includedir}/initreq.h
-%{_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
-%{_bindir}/*
-/sbin/change_console
-/sbin/pidof
-/sbin/killall5
-/sbin/sulogin
-%{_mandir}/man1/*
-%{_mandir}/man8/change_console*
-%{_mandir}/man8/killall5*
-%{_mandir}/man8/pidof*
-%{_mandir}/man8/sulogin*
+%{_mandir}/*/*
 
 %changelog
-* Fri Feb  1 2008 Bill Nottingham <notting at redhat.com> - 2.86-19
-- split off a -tools subpackage to avoid upstart conflicts (#431110)
+* Fri Feb 15 2008 Bill Nottingham <notting at redhat.com> - 2.86-20
+- don't abort if policy is already loaded (#431113)
 
 * Wed Oct 10 2007 Bill Nottingham <notting at redhat.com> - 2.86-18
 - rebuild for buildid