From 75e5a7bdfeac9eb608a79a7ea26fd57e02d51467 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 6 Jul 2012 09:06:06 -0400 Subject: [PATCH 1/2] 9.37.1 --- .gitignore | 1 + initscripts.spec | 14 ++++++++++++-- sources | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6aa8229..2ab0944 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /initscripts-9.37.tar.bz2 +/initscripts-9.37.1.tar.bz2 diff --git a/initscripts.spec b/initscripts.spec index 55e2833..7f2f5b7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.37 +Version: 9.37.1 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -12,7 +12,7 @@ Release: 1%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: mingetty, /bin/awk, /bin/sed, coreutils +Requires: /bin/awk, /bin/sed, coreutils Requires: /sbin/sysctl Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid @@ -22,6 +22,7 @@ Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 %if %{_with_upstart} Conflicts: upstart < 0.6.0 +Requires: mingetty %if ! %{_with_systemd} Requires: upstart-sysvinit %endif @@ -35,6 +36,7 @@ Requires: systemd-sysvinit %endif %if %{_with_sysvinit} Requires: SysVinit >= 2.85-38 +Requires: mingetty %endif Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find Requires: /etc/system-release @@ -299,6 +301,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /etc/tmpfiles.d /etc/tmpfiles.d/initscripts.conf +%dir /usr/libexec/initscripts/legacy-actions %files legacy %defattr(-,root,root) @@ -326,6 +329,13 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Fri Jul 6 2012 Bill Nottingham - 9.37.1-1 +- assorted documentation cleanups +- service: add support for legacy custom actions packaged in + /usr/libexec/initscripts/legacy-actions/