Author: glen Date: Tue Apr 20 06:13:19 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix some rc-scripts paths, kill init on 0.6 upgrade
---- Files affected: packages/upstart: upstart.spec (1.44 -> 1.45) , rc-scripts-paths.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/upstart/upstart.spec diff -u packages/upstart/upstart.spec:1.44 packages/upstart/upstart.spec:1.45 --- packages/upstart/upstart.spec:1.44 Mon Apr 19 23:28:47 2010 +++ packages/upstart/upstart.spec Tue Apr 20 08:13:14 2010 @@ -1,7 +1,9 @@ # $Revision$, $Date$ +# TODO +# - 2 of 13 tests failed # # Conditional build: -%bcond_without tests # don't perform "make check" +%bcond_with tests # don't perform "make check" Summary: Event-based init daemon Summary(pl.UTF-8): Oparty na zdarzeniach demon init @@ -10,24 +12,26 @@ Release: 1 License: GPL v2 Group: Base -Source0: http://upstart.ubuntu.com/download/0.6/upstart-%{version}.tar.gz +Source0: http://upstart.ubuntu.com/download/0.6/%{name}-%{version}.tar.gz # Source0-md5: f9466bba72b655c2408353b64105853f -URL: http://upstart.ubuntu.com/ +URL: http://upstart.ubuntu.com/ +Patch0: rc-scripts-paths.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 BuildRequires: dbus-devel >= 1.2.16-1 -BuildRequires: libnih-devel >= 1.0.1 BuildRequires: expat-devel BuildRequires: gcc >= 5:4.0 BuildRequires: gettext >= 0.14.5 BuildRequires: glibc-headers >= 6:2.4.0 +BuildRequires: libnih-devel >= 1.0.1 BuildRequires: libtool >= 2:1.5.22 BuildRequires: pkgconfig Requires: dbus-libs >= 1.2.14-2 Suggests: dbus -Conflicts: dbus < 1.2.12-2 Provides: virtual(init-daemon) Obsoletes: virtual(init-daemon) +Conflicts: dbus < 1.2.12-2 +Conflicts: upstart-SysVinit < 2.86-23 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -44,6 +48,7 @@ %prep %setup -q +%patch0 -p1 %build %{__aclocal} -I m4 @@ -79,10 +84,13 @@ %triggerpostun -- glibc /sbin/telinit u || : +%triggerpostun -- upstart < 0.6.0 +[ -f /proc/1/exe -a -d /proc/1/root ] && kill -TERM 1 + %files -f upstart.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS TODO -%{_sysconfdir}/dbus-1/system.d/Upstart.conf +/etc/dbus-1/system.d/Upstart.conf %dir %{_sysconfdir}/init %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/init/*.conf %attr(755,root,root) %{_sbindir}/halt @@ -108,6 +116,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.45 2010/04/20 06:13:14 glen +- fix some rc-scripts paths, kill init on 0.6 upgrade + Revision 1.44 2010/04/19 21:28:47 glen - up to 0.6.5 ================================================================ Index: packages/upstart/rc-scripts-paths.patch diff -u /dev/null packages/upstart/rc-scripts-paths.patch:1.1 --- /dev/null Tue Apr 20 08:13:19 2010 +++ packages/upstart/rc-scripts-paths.patch Tue Apr 20 08:13:14 2010 @@ -0,0 +1,19 @@ +--- upstart-0.6.5/conf/rc.conf~ 2009-10-23 23:47:27.000000000 +0300 ++++ upstart-0.6.5/conf/rc.conf 2010-04-20 08:02:17.867240857 +0300 +@@ -15,4 +15,4 @@ + task + + console output +-exec /etc/init.d/rc $RUNLEVEL ++exec /etc/rc.d/rc $RUNLEVEL +--- upstart-0.6.5/conf/rc-sysinit.conf~ 2010-02-04 05:58:39.000000000 +0200 ++++ upstart-0.6.5/conf/rc-sysinit.conf 2010-04-20 08:04:26.690246472 +0300 +@@ -51,7 +51,7 @@ + done + + # Run the system initialisation scripts +- [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/rcS ++ [ -n "${FROM_SINGLE_USER_MODE}" ] || /etc/init.d/single start + + # Switch into the default runlevel + telinit "${DEFAULT_RUNLEVEL}" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/upstart.spec?r1=1.44&r2=1.45&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
