up to 3.8.6, run tests

diff --git a/logrotate-man.patch b/logrotate-man.patch
index b441c8f2f771997a35a2c6a0e8160790681bae29..fc070271dadacee7710c413462d0a4c1883675f7 100644 (file)
--- a/logrotate-man.patch
+++ b/logrotate-man.patch
@@ -1,24 +1,20 @@
---- logrotate-3.7.8/logrotate.8.orig   2008-12-06 15:05:40.000000000 +0100
-+++ logrotate-3.7.8/logrotate.8        2009-02-03 07:37:38.410450504 +0100
-@@ -52,10 +52,10 @@
- -s\fR.
- 
- .TP
--\fB-s, -\-state <statefile>\fR
-+\fB-s\fR,\fB -\-state <statefile>\fR
+--- logrotate-3.8.5/logrotate.8~       2013-08-29 17:03:00.000000000 +0300
++++ logrotate-3.8.5/logrotate.8        2013-08-29 17:05:44.974064909 +0300
+@@ -59,7 +59,7 @@
+ \fB\-s\fR, \fB\-\-state <statefile>\fR
  Tells \fBlogrotate\fR to use an alternate state file.  This is useful
  if logrotate is being run as a different user for various sets of
 -log files.  The default state file is \fI/var/lib/logrotate.status\fR.
 +log files.  The default state file is \fI/var/lib/misc/logrotate.status\fR.
  
  .TP
- \fB-\-usage\fR
-@@ -118,7 +118,7 @@
+ \fB\-\-usage\fR
+@@ -125,7 +125,7 @@
  \fI/var/log/messages\fR. The log will go through five weekly rotations before
  being removed. After the log file has been rotated (but before the old
  version of the log has been compressed), the command 
--\fI/sbin/killall -HUP syslogd\fR will be executed.
-+\fI/usr/bin/killall -HUP syslogd\fR will be executed.
+-\fI/sbin/killall \-HUP syslogd\fR will be executed.
++\fI/usr/bin/killall \-HUP syslogd\fR will be executed.
  
  The next section defines the parameters for both
  \fI/var/log/httpd/access.log\fR and \fI/var/log/httpd/error.log\fR.

diff --git a/logrotate.spec b/logrotate.spec
index 868b2e4608f0f43486085f054e55282052be3786..b11c13d6e5c5346d488eca84f0ebd3c9abd07418 100644 (file)
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -7,7 +7,8 @@
 # Conditional build:
 %bcond_without acl             # build without ACLs support
 %bcond_without selinux         # build without SELinux support
-#
+%bcond_without tests   # do not perform "make test"
+
 Summary:       Rotates, compresses, removes and mails system log files
 Summary(de.UTF-8):     Rotiert, komprimiert und verschickt Systemlogs
 Summary(es.UTF-8):     Hace el rutado, comprime y envía mail de logs del sistema
@@ -18,12 +19,12 @@ Summary(ru.UTF-8):  Ротирует, компрессирует, удаляет
 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.8.3
+Version:       3.8.6
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz
-# Source0-md5: df67c8bda9139131d919931da443794d
+# Source0-md5: cd0082bbd7248e627ec659f2442fcdf9
 Source1:       %{name}.conf
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-cron.patch
@@ -121,6 +122,10 @@ Logrotate призначений для полегшення адміністр
        WITH_SELINUX=%{?with_selinux:yes}%{!?with_selinux:no} \
        STATEFILE="%{statdir}/logrotate.status"
 
+%if %{with tests}
+%{__make} test
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{cron.daily,logrotate.d,sysconfig} \