Author: arekm Date: Sun Dec 4 18:47:07 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 4; make upstart use SysVinit-tools; upstart-SysVinit is thus obsolete package
---- Files affected: packages/upstart: upstart.spec (1.69 -> 1.70) , sysvinit.logrotate (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/upstart/upstart.spec diff -u packages/upstart/upstart.spec:1.69 packages/upstart/upstart.spec:1.70 --- packages/upstart/upstart.spec:1.69 Sat Jul 30 15:31:20 2011 +++ packages/upstart/upstart.spec Sun Dec 4 19:47:01 2011 @@ -11,7 +11,7 @@ Summary(pl.UTF-8): Oparty na zdarzeniach demon init Name: upstart Version: 1.3 -Release: 3 +Release: 4 License: GPL v2 Group: Base Source0: http://launchpad.net/upstart/1.x/1.3/+download/%{name}-%{version}.tar.gz @@ -22,6 +22,7 @@ Source1: start-ttys.conf Source2: tty.conf Source3: %{name}.sysconfig +Source4: sysvinit.logrotate BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 BuildRequires: dbus-devel >= 1.2.16-1 @@ -35,13 +36,14 @@ BuildRequires: rpmbuild(macros) >= 1.615 BuildRequires: udev-devel >= 146 Requires: dbus-libs >= 1.2.14-2 -Requires: filesystem >= 3.0-35 +Requires: filesystem >= 4.0 +Requires: SysVinit-tools Suggests: dbus Suggests: vim-syntax-upstart Provides: virtual(init-daemon) Obsoletes: virtual(init-daemon) Conflicts: dbus < 1.2.12-2 -Conflicts: upstart-SysVinit < 2.86-23.2 +Conflicts: upstart-SysVinit BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _sbindir /sbin @@ -80,7 +82,7 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/sysconfig,/lib/init} +install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,sysconfig},/lib/init,/var/{run,log}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -89,20 +91,45 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name} +ln -sf ../var/run/initrunlvl $RPM_BUILD_ROOT%{_sysconfdir} +cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/sysvinit +> $RPM_BUILD_ROOT/var/run/initrunlvl +> $RPM_BUILD_ROOT%{_sysconfdir}/ioctl.save +> $RPM_BUILD_ROOT/var/log/faillog +> $RPM_BUILD_ROOT/var/log/lastlog +> $RPM_BUILD_ROOT/var/log/wtmpx +> $RPM_BUILD_ROOT/var/log/btmpx + # no -devel rm -rf $RPM_BUILD_ROOT%{_includedir} rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{la,so} rm -rf $RPM_BUILD_ROOT%{_aclocaldir} - %clean rm -rf $RPM_BUILD_ROOT +%pre +%groupadd -g 22 utmp + %post /sbin/ldconfig + +touch %{_sysconfdir}/ioctl.save /var/log/{{fail,last}log,btmpx} +chmod 000 %{_sysconfdir}/ioctl.save /var/log/{fail,last}log +chown root:root %{_sysconfdir}/ioctl.save /var/log/faillog +chown root:utmp /var/log/lastlog +chmod 600 %{_sysconfdir}/ioctl.save +chmod 640 /var/log/faillog +chmod 660 /var/log/lastlog +chmod 640 /var/log/btmpx + /sbin/telinit u || : -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + %groupremove utmp +fi %triggerpostun -- glibc /sbin/telinit u || : @@ -142,12 +169,24 @@ %{_mandir}/man7/*.7* %{_mandir}/man8/*.8* +%attr(640,root,root) /etc/logrotate.d/sysvinit +%ghost %{_sysconfdir}/initrunlvl +%ghost /var/run/initrunlvl +%attr(600,root,root) %ghost %{_sysconfdir}/ioctl.save +%attr(640,root,root) %ghost /var/log/faillog +%attr(660,root,utmp) %ghost /var/log/lastlog +%attr(664,root,utmp) %ghost /var/log/wtmpx +%attr(640,root,root) %ghost /var/log/btmpx + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2011/12/04 18:47:01 arekm +- rel 4; make upstart use SysVinit-tools; upstart-SysVinit is thus obsolete package + Revision 1.69 2011/07/30 13:31:20 glen - fix drm-device-added manual page ================================================================ Index: packages/upstart/sysvinit.logrotate diff -u /dev/null packages/upstart/sysvinit.logrotate:1.1 --- /dev/null Sun Dec 4 19:47:07 2011 +++ packages/upstart/sysvinit.logrotate Sun Dec 4 19:47:01 2011 @@ -0,0 +1,11 @@ +#/var/log/lastlog { +# don't rotate! +#} + +/var/log/btmpx { +} + +#/var/log/wtmpx { +# create 664 root utmp +# monthly +#} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart/upstart.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
