|
@@ -5,7 +5,7 @@
|
|
|
Summary: The inittab file and the /etc/rc.d scripts.
|
|
|
Summary(ja): inittab と /etc/rc.d 以下の起動スクリプト一式
|
|
|
Name: initscripts
|
|
|
-Version: 8.90.4
|
|
|
+Version: 8.90.5
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Base
|
|
@@ -15,12 +15,14 @@ Source: %{name}-vine-%{version}.tar.bz2
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
+BuildRequires: glib2-devel, popt-devel
|
|
|
+
|
|
|
Requires: mingetty, gawk, sed, mktemp, e2fsprogs >= 1.15
|
|
|
Requires: procps >= 3.2.7, syslog
|
|
|
Requires: setup >= 2.5.7, psmisc, which, grep
|
|
|
Requires: module-init-tools >= 3.6
|
|
|
Requires: util-linux-ng
|
|
|
-Requires: SysVinit >= 2.86
|
|
|
+Requires: upstart >= 0.6.5
|
|
|
Requires: iproute, iputils >= 20020927
|
|
|
Requires: kbd
|
|
|
Requires: dhclient, ethtool
|
|
@@ -30,10 +32,9 @@ Conflicts: kernel <= 2.4, timeconfig < 3.0, pppd < 2.3.9, wvdial < 1.40-3
|
|
|
Conflicts: ypbind < 1.6-12
|
|
|
Obsoletes: rhsound, sapinit
|
|
|
|
|
|
-PreReq: shadow-utils, gawk, coreutils
|
|
|
-PreReq: chkconfig >= 1.2.17-1vl6
|
|
|
-PreReq: sed
|
|
|
-BuildPrereq: glib2-devel, popt
|
|
|
+Requires(pre): shadow-utils
|
|
|
+Requires(post): gawk, coreutils, sed, chkconfig
|
|
|
+Requires(preun): chkconfig
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -70,6 +71,9 @@ for foo in * ; do
|
|
|
done
|
|
|
popd
|
|
|
|
|
|
+# upstart
|
|
|
+mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
|
|
|
+
|
|
|
rm -f $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-{ctc,escon,iucv}
|
|
|
rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
|
|
|
$RPM_BUILD_ROOT/lib/udev/ccw_init
|
|
@@ -366,7 +370,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
%config(noreplace) /etc/networks
|
|
|
%config /etc/X11/prefdm
|
|
|
%config(noreplace) /etc/inittab
|
|
|
-%config(noreplace) /etc/inittab.upstart
|
|
|
+%config(noreplace) /etc/inittab.sysv
|
|
|
|
|
|
/lib/udev/rules.d/*
|
|
|
/lib/udev/rename_device
|
|
@@ -419,13 +423,23 @@ rm -rf ${RPM_BUILD_ROOT}
|
|
|
%config(noreplace) /etc/initlog.conf
|
|
|
/etc/NetworkManager/dispatcher.d/00-netreport
|
|
|
/etc/NetworkManager/dispatcher.d/05-netfs
|
|
|
-%doc sysconfig.txt sysvinitfiles ChangeLog.rh static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-event.d
|
|
|
+%doc sysconfig.txt sysvinitfiles ChangeLog.rh static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
|
|
|
%ghost %attr(0664,root,utmp) /var/log/btmp
|
|
|
%ghost %attr(0664,root,utmp) /var/log/wtmp
|
|
|
%ghost %attr(0664,root,utmp) /var/run/utmp
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon May 17 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 8.90.5-1
|
|
|
+- rc.d/rc
|
|
|
+ - do not shutdown plymouth in rc, we handle this by upstart.
|
|
|
+- prefdm
|
|
|
+ - add "--retain-splash" for gdm, kdm or lxdm.
|
|
|
+- Require upstart instead of SysVinit
|
|
|
+- BR popt-devel instead of popt
|
|
|
+- use Requires(pre,post,preun) instead of Prereq
|
|
|
+- use BuildRequires instead of BuildPrereq
|
|
|
+
|
|
|
* Wed May 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 8.90.4-1
|
|
|
- add /etc/init for upstart configs
|
|
|
- remove old/legacy /etc/event.d
|