Author: glen Date: Tue Apr 20 13:54:24 2010 GMT Module: packages Tag: HEAD ---- Log message: - move /var/log/archive to filesystem, rel 8 - (pretrans for archiv rename dropped from here, move it to filesystem as well or just forget it?)
---- Files affected: packages/logrotate: logrotate.spec (1.97 -> 1.98) ---- Diffs: ================================================================ Index: packages/logrotate/logrotate.spec diff -u packages/logrotate/logrotate.spec:1.97 packages/logrotate/logrotate.spec:1.98 --- packages/logrotate/logrotate.spec:1.97 Tue Feb 2 09:06:27 2010 +++ packages/logrotate/logrotate.spec Tue Apr 20 15:54:18 2010 @@ -19,7 +19,7 @@ Summary(uk.UTF-8): Ротує, компресує, видаляє та відправляє поштою лог-файли Name: logrotate Version: 3.7.8 -Release: 7 +Release: 8 License: GPL v2 Group: Applications/System Source0: https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz @@ -33,7 +33,7 @@ BuildRequires: popt-devel >= 1.3 Requires: coreutils Requires: crondaemon -Requires: filesystem >= 3.0-22 +Requires: filesystem >= 3.0-34 Requires: gzip Requires: setup >= 2.4.6 Suggests: /bin/mail @@ -120,7 +120,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{cron.daily,logrotate.d,sysconfig} \ - $RPM_BUILD_ROOT{%{_mandir},%{statdir},/var/log/archive} + $RPM_BUILD_ROOT{%{_mandir},%{statdir}} %{__make} install \ BINDIR=$RPM_BUILD_ROOT%{_sbindir} \ @@ -134,25 +134,6 @@ %clean rm -rf $RPM_BUILD_ROOT -%pretrans -# change /var/log/archiv to /var/log/archive -if [ ! -L /var/log/archiv ]; then - if [ -d /var/log/archiv ]; then - if [ -d /var/log/archive ]; then - if [ ! -L /var/log/archive ]; then - mv /var/log/archiv/* /var/log/archive - rmdir /var/log/archiv 2>/dev/null || mv -v /var/log/archiv{,.rpmsave} - else - mv -v /var/log/archive{,.rpmsave} - mv /var/log/archiv /var/log/archive - fi - else - mv /var/log/archiv /var/log/archive - fi - fi -fi -exit 0 - %triggerpostun -- %{name} < 3.7.8-4 %{__sed} -i -e 's,olddir /var/log/archiv$,olddir /var/log/archive,' %{_sysconfdir}/logrotate.conf %{_sysconfdir}/logrotate.d/* || : @@ -174,7 +155,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(640,root,root) %ghost %{statdir}/logrotate.status -%attr(750,root,logs) %dir /var/log/archive %{_mandir}/man8/logrotate.8* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -183,6 +163,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.98 2010/04/20 13:54:18 glen +- move /var/log/archive to filesystem, rel 8 +- (pretrans for archiv rename dropped from here, move it to filesystem as well or just forget it?) + Revision 1.97 2010/02/02 08:06:27 glen - release 7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logrotate/logrotate.spec?r1=1.97&r2=1.98&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
