Author: glen Date: Tue Apr 20 18:17:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add upstart sysconfig, for start-ttys.conf for now
---- Files affected:
packages/upstart:
start-ttys.conf (1.1 -> 1.2) , upstart.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: packages/upstart/start-ttys.conf
diff -u packages/upstart/start-ttys.conf:1.1
packages/upstart/start-ttys.conf:1.2
--- packages/upstart/start-ttys.conf:1.1 Tue Apr 20 20:11:05 2010
+++ packages/upstart/start-ttys.conf Tue Apr 20 20:17:25 2010
@@ -7,8 +7,8 @@
env X_TTY=/dev/tty5
task
script
- if [ -f /etc/sysconfig/system ]; then
- . /etc/sysconfig/system
+ if [ -f /etc/sysconfig/upstart ]; then
+ . /etc/sysconfig/upstart
fi
for tty in $(echo $ACTIVE_CONSOLES) ; do
[ "$RUNLEVEL" = "5" -a "$tty" = "$X_TTY" ] && continue
================================================================
Index: packages/upstart/upstart.spec
diff -u packages/upstart/upstart.spec:1.46 packages/upstart/upstart.spec:1.47
--- packages/upstart/upstart.spec:1.46 Tue Apr 20 20:11:05 2010
+++ packages/upstart/upstart.spec Tue Apr 20 20:17:25 2010
@@ -9,7 +9,7 @@
Summary(pl.UTF-8): Oparty na zdarzeniach demon init
Name: upstart
Version: 0.6.5
-Release: 1.4
+Release: 1.6
License: GPL v2
Group: Base
Source0: http://upstart.ubuntu.com/download/0.6/%{name}-%{version}.tar.gz
@@ -18,6 +18,7 @@
Patch0: pldize.patch
Source1: start-ttys.conf
Source2: tty.conf
+Source3: upstart.sysconfig
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
BuildRequires: dbus-devel >= 1.2.16-1
@@ -66,12 +67,15 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/sysconfig
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%find_lang upstart
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+
# no -devel
rm -rf $RPM_BUILD_ROOT%{_includedir}
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{la,so}
@@ -96,6 +100,7 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog HACKING NEWS TODO
/etc/dbus-1/system.d/Upstart.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%dir %{_sysconfdir}/init
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/init/control-alt-delete.conf
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/init/start-ttys.conf
@@ -123,6 +128,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2010/04/20 18:17:25 glen
+- add upstart sysconfig, for start-ttys.conf for now
+
Revision 1.46 2010/04/20 18:11:05 glen
- refresh initscripts, inspired from rawhide cvs. works for me
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/start-ttys.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/upstart.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
