Attachment 293752 Details for Bug 431110 – spec diff

[patch] spec diff

diff (text/plain), 3.05 KB, created by Bill Nottingham on 2008-02-01 18:24:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2008-02-01 18:24:13 UTC

Size: 3.05 KB

patch

obsolete

>? .build--.log
>? .build-2.86-18.foo.log
>? .build-2.86-18.foo2.log
>? .build-2.86-18.log
>? sysvinit-2.86
>? sysvinit-2.86-18.foo.src.rpm
>? sysvinit-2.86-18.foo2.src.rpm
>? sysvinit-2.86-18.src.rpm
>? sysvinit-no-abort.patch
>? x86_64
>Index: sysvinit.spec
>===================================================================
>RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
>retrieving revision 1.62
>diff -u -r1.62 sysvinit.spec
>--- sysvinit.spec	10 Oct 2007 19:51:14 -0000	1.62
>+++ sysvinit.spec	1 Feb 2008 18:22:53 -0000
>@@ -1,7 +1,7 @@
> Summary: Programs which control basic system processes
> Name: sysvinit
> Version: 2.86
>-Release: 18
>+Release: 19
> License: GPLv2+
> Group: System Environment/Base
> Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
>@@ -26,12 +26,14 @@
> Patch18: sysvinit-2.86-timeval.patch
> Patch19: sysvinit-2.86-console-open.patch
> Patch20: sysvinit-selinux.patch
>+Patch21: sysvinit-no-abort.patch
> Source1: change_console.c
> Source2: change_console.8
> Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 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
>@@ -43,6 +45,14 @@
> 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)
>@@ -88,6 +98,7 @@
> %patch19 -p1 -b .console-open
> # SELinux support for init - loading policy, etc.
> %patch20 -p1 -b .selinux
>+%patch21 -p1 -b .abort
> 
> %build
> make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -C src
>@@ -123,24 +134,41 @@
> /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}/*/*
>+%{_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*
> 
> %changelog
>+* Fri Feb  1 2008 Bill Nottingham <notting@redhat.com> - 2.86-19
>+- split off a -tools subpackage to avoid upstart conflicts (#431110)
>+
> * Wed Oct 10 2007 Bill Nottingham <notting@redhat.com> - 2.86-18
> - rebuild for buildid
>

Actions: View | Diff

Attachments on bug 431110: 293752