[logrotate: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/logrotate

[Jan Kaluža]

commit a6b37c7f6ba9021c23f70d537d81055b8f1d62b5
Merge: 8d1447c e93251a
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Aug 1 09:00:26 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/logrotate
    
    Conflicts:
    	logrotate.spec

 logrotate-3.8.0-rot-size.patch |   44 ++++++++++++++++++++++++++++++++++++++++
 logrotate.spec                 |   13 ++++++++---
 2 files changed, 53 insertions(+), 4 deletions(-)
---
diff --cc logrotate.spec
index ad39fbe,75d6d20..fc8993c
--- a/logrotate.spec
+++ b/logrotate.spec
@@@ -1,13 -1,13 +1,14 @@@
  Summary: Rotates, compresses, removes and mails system log files
  Name: logrotate
  Version: 3.8.0
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPL+
  Group: System Environment/Base
  Url: https://fedorahosted.org/logrotate/
  Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
  Patch0: logrotate-3.8.0-no-cron-redirection.patch
- Patch1: logrotate-3.8.0-handle-acl-not-supported.patch
+ Patch1: logrotate-3.8.0-rot-size.patch
++Patch2: logrotate-3.8.0-handle-acl-not-supported.patch
  
  Requires: coreutils >= 5.92 libsepol libselinux popt libacl
  BuildRequires: libselinux-devel popt-devel libacl-devel
@@@ -28,7 -28,7 +29,8 @@@ log files on your system
  %setup -q
  
  %patch0 -p1
- %patch1
+ %patch1 -p1
++%patch2
  
  %build
  make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" WITH_SELINUX=yes WITH_ACL=yes
@@@ -59,10 -59,9 +61,13 @@@ rm -rf $RPM_BUILD_ROO
  %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) %{_localstatedir}/lib/logrotate.status
  
  %changelog
- * Wed Aug 01 2011 Jan Kaluza <jkaluza at redhat.com> 3.8.0-3
++* Wed Aug 01 2011 Jan Kaluza <jkaluza at redhat.com> 3.8.0-4
 +- fix #726980 - work properly when acl_get_fd is supported,
 +  but acl_set_fd is not
 +
+ * Fri Jul 22 2011 Jan Kaluza <jkaluza at redhat.com> 3.8.0-3
+ - fix #723547 - fixed size directive parsing
+ 
  * Wed Jul 20 2011 Jan Kaluza <jkaluza at redhat.com> 3.8.0-2
  - fix #722825 - do not redirect logrotate output in cron script