Author: glen Date: Mon Jul 12 07:45:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.7.9
---- Files affected:
packages/logrotate:
logrotate-cron.patch (1.2 -> 1.3) , logrotate.spec (1.98 -> 1.99)
---- Diffs:
================================================================
Index: packages/logrotate/logrotate-cron.patch
diff -u packages/logrotate/logrotate-cron.patch:1.2
packages/logrotate/logrotate-cron.patch:1.3
--- packages/logrotate/logrotate-cron.patch:1.2 Thu Jan 10 07:08:20 2008
+++ packages/logrotate/logrotate-cron.patch Mon Jul 12 09:45:53 2010
@@ -1,23 +1,23 @@
-diff -uNr logrotate-3.7.6.orig/examples/logrotate.cron
logrotate-3.7.6/examples/logrotate.cron
---- logrotate-3.7.6.orig/examples/logrotate.cron 2003-07-09
19:36:35.000000000 +0000
-+++ logrotate-3.7.6/examples/logrotate.cron 2008-01-09 20:24:24.000000000
+0000
+--- logrotate-3.7.9/examples/logrotate.cron~ 2010-06-28 11:04:56.000000000
+0300
++++ logrotate-3.7.9/examples/logrotate.cron 2010-07-12 10:42:34.890404991
+0300
@@ -1,8 +1,18 @@
#!/bin/sh
--/usr/sbin/logrotate /etc/logrotate.conf
+-/usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1
+MAILTO=""
+ARG=""
+
-+if [ -e "/etc/sysconfig/logrotate" ]; then
++if [ -e /etc/sysconfig/logrotate ]; then
+ . /etc/sysconfig/logrotate
+fi
+
-+/usr/sbin/logrotate ${ARG} /etc/logrotate.conf
++/usr/sbin/logrotate $ARG /etc/logrotate.conf >/dev/null 2>&1
EXITVALUE=$?
if [ $EXITVALUE != 0 ]; then
- /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
-+ if [ "${MAILTO}" != "" ]; then
-+ echo "ALERT exited abnormally with [$EXITVALUE]" | mail -s "logrotate
exited abnormally" ${MAILTO}
-+ fi
+- /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
++ /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
++ if [ -n "$MAILTO" ]; then
++ echo "ALERT exited abnormally with [$EXITVALUE]" | mail -s
"logrotate exited abnormally" $MAILTO
++ fi
fi
exit 0
================================================================
Index: packages/logrotate/logrotate.spec
diff -u packages/logrotate/logrotate.spec:1.98
packages/logrotate/logrotate.spec:1.99
--- packages/logrotate/logrotate.spec:1.98 Tue Apr 20 15:54:18 2010
+++ packages/logrotate/logrotate.spec Mon Jul 12 09:45:53 2010
@@ -18,12 +18,12 @@
Summary(tr.UTF-8): Sistem günlüklerini yönlendirir, sıkıştırır ve mektup
olarak yollar
Summary(uk.UTF-8): Ротує, компресує, видаляє та відправляє поштою лог-файли
Name: logrotate
-Version: 3.7.8
-Release: 8
+Version: 3.7.9
+Release: 1
License: GPL v2
Group: Applications/System
Source0:
https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz
-# Source0-md5: b3589bea6d8d5afc8a84134fddaae973
+# Source0-md5: eeba9dbca62a9210236f4b83195e4ea5
Source1: %{name}.conf
Source2: %{name}.sysconfig
Patch0: %{name}-cron.patch
@@ -126,9 +126,9 @@
BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
MANDIR=$RPM_BUILD_ROOT%{_mandir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/logrotate
-install examples/logrotate.cron $RPM_BUILD_ROOT/etc/cron.daily/logrotate
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/logrotate
+install -p examples/logrotate.cron $RPM_BUILD_ROOT/etc/cron.daily/logrotate
> $RPM_BUILD_ROOT%{statdir}/logrotate.status
%clean
@@ -155,6 +155,7 @@
%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
+%{_mandir}/man5/logrotate.conf.5*
%{_mandir}/man8/logrotate.8*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -163,6 +164,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2010/07/12 07:45:53 glen
+- up to 3.7.9
+
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?)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logrotate/logrotate-cron.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logrotate/logrotate.spec?r1=1.98&r2=1.99&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
