packages: SysVinit/SysVinit.spec - moved /var/log/{fail, last}log to tools t...

gotar gotar at pld-linux.org
Tue Nov 29 00:50:03 CET 2011


Author: gotar                        Date: Mon Nov 28 23:50:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved /var/log/{fail,last}log to tools too, other cosmetics, rel. 29

---- Files affected:
packages/SysVinit:
   SysVinit.spec (1.159 -> 1.160) 

---- Diffs:

================================================================
Index: packages/SysVinit/SysVinit.spec
diff -u packages/SysVinit/SysVinit.spec:1.159 packages/SysVinit/SysVinit.spec:1.160
--- packages/SysVinit/SysVinit.spec:1.159	Sun Nov 27 19:53:12 2011
+++ packages/SysVinit/SysVinit.spec	Tue Nov 29 00:49:58 2011
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8):	Програми, що керують базовими системними процесами
 Name:		SysVinit
 Version:	2.86
-Release:	28
+Release:	29
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
@@ -176,23 +176,23 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/sysvinit
 
-ln -sf ../var/run/initrunlvl $RPM_BUILD_ROOT%{_sysconfdir}
-ln -sf killall5 $RPM_BUILD_ROOT%{_sbindir}/pidof
+ln -s ../var/run/initrunlvl $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s killall5 $RPM_BUILD_ROOT%{_sbindir}/pidof
 
-> $RPM_BUILD_ROOT/var/run/initrunlvl
 > $RPM_BUILD_ROOT%{_sysconfdir}/ioctl.save
+> $RPM_BUILD_ROOT/var/log/btmpx
 > $RPM_BUILD_ROOT/var/log/faillog
 > $RPM_BUILD_ROOT/var/log/lastlog
 > $RPM_BUILD_ROOT/var/log/wtmpx
-> $RPM_BUILD_ROOT/var/log/btmpx
+> $RPM_BUILD_ROOT/var/run/initrunlvl
 
 echo .so last.1 > $RPM_BUILD_ROOT%{_mandir}/man1/lastb.1
 echo .so halt.8 > $RPM_BUILD_ROOT%{_mandir}/man8/poweroff.8
 echo .so halt.8 > $RPM_BUILD_ROOT%{_mandir}/man8/reboot.8
 echo .so init.8 > $RPM_BUILD_ROOT%{_mandir}/man8/telinit.8
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_includedir}/initreq.h
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.sysvinit-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/initreq.h
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.sysvinit-non-english-man-pages
 
 cp -a man/intl/* $RPM_BUILD_ROOT%{_mandir}
 
@@ -206,14 +206,14 @@
 %groupadd -g 22 utmp
 
 %post
-touch %{_sysconfdir}/ioctl.save /var/log/{{fail,last}log,btmpx}
+touch %{_sysconfdir}/ioctl.save /var/log/{btmpx,{fail,last}log}
 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/btmpx
 chmod 640 /var/log/faillog
 chmod 664 /var/log/lastlog
-chmod 640 /var/log/btmpx
 if [ -p /dev/initctl ]; then
 	%{_sbindir}/telinit u || :
 fi
@@ -244,10 +244,8 @@
 %ghost %{_sysconfdir}/initrunlvl
 %ghost /var/run/initrunlvl
 %attr(600,root,root) %ghost %{_sysconfdir}/ioctl.save
-%attr(640,root,root) %ghost /var/log/faillog
-%attr(664,root,utmp) %ghost /var/log/lastlog
-%attr(664,root,utmp) %ghost /var/log/wtmpx
 %attr(640,root,root) %ghost /var/log/btmpx
+%attr(664,root,utmp) %ghost /var/log/wtmpx
 
 %{_mandir}/man5/inittab.5*
 %{_mandir}/man5/initscript.5*
@@ -332,6 +330,8 @@
 %attr(755,root,root) %{_bindir}/mesg
 %attr(755,root,root) %{_bindir}/utmpx-dump
 %attr(755,root,root) %{_bindir}/wall
+%attr(640,root,root) %ghost /var/log/faillog
+%attr(664,root,utmp) %ghost /var/log/lastlog
 %{_mandir}/man1/last.1*
 %{_mandir}/man1/lastb.1*
 %{_mandir}/man1/mesg.1*
@@ -399,6 +399,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2011/11/28 23:49:58  gotar
+- moved /var/log/{fail,last}log to tools too, other cosmetics, rel. 29
+
 Revision 1.159  2011/11/27 18:53:12  wiget
 - moved lastlog to -tools subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/SysVinit/SysVinit.spec?r1=1.159&r2=1.160&f=u



More information about the pld-cvs-commit mailing list