From c292cc346c4cad784abefbb7e2b3be29456fdaff Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Tue, 27 May 2014 17:28:53 +0200
Subject: [PATCH] Updated to 10.3.1

- resolves: #1077640
  updated to 10.3.1
  migrated to systemd timer units
---
 .gitignore   |  2 +-
 sources      |  2 +-
 sysstat.spec | 25 ++++++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a900b4a..050a4b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/sysstat-10.2.1.tar.xz
+/sysstat-10.3.1.tar.xz
diff --git a/sources b/sources
index 488d66a..3b85d7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-922958de1b54b657a08e87e353f4002f  sysstat-10.2.1.tar.xz
+3381abb994542ecdc6272f1c572058df  sysstat-10.3.1.tar.xz
diff --git a/sysstat.spec b/sysstat.spec
index c25a65e..16f177a 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,13 +1,13 @@
 Summary: Collection of performance monitoring tools for Linux
 Name: sysstat
-Version: 10.2.1
+Version: 10.3.1
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://sebastien.godard.pagesperso-orange.fr/
 Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
 
-Requires: /etc/cron.d, fileutils, grep, sh-utils, textutils
+Requires: fileutils, grep, sh-utils, textutils
 Requires(post): systemd, systemd-sysv
 Requires(preun): systemd
 Requires(postun): systemd
@@ -50,28 +50,27 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 
-# Install cron file
-mkdir -p %{buildroot}%{_sysconfdir}/cron.d
-install -m 0644 cron/sysstat.crond %{buildroot}%{_sysconfdir}/cron.d/sysstat
-
 # Install service file
 mkdir -p %{buildroot}%{_unitdir}
 install -m 0644 sysstat.service %{buildroot}%{_unitdir}/
 
+# Install timer units
+install -m 0644 cron/sysstat-{collect,summary}.{service,timer} %{buildroot}%{_unitdir}/
+
 %find_lang %{name}
 
 %post
-%systemd_post sysstat.service
+%systemd_post sysstat.service sysstat-collect.timer sysstat-summary.timer
 
 %preun
-%systemd_preun sysstat.service
+%systemd_preun sysstat.service sysstat-collect.timer sysstat-summary.timer
 if [[ $1 -eq 0 ]]; then
   # Remove sa logs if removing sysstat completely
   rm -f %{_localstatedir}/log/sa/*
 fi
 
 %postun
-%systemd_postun sysstat.service
+%systemd_postun sysstat.service sysstat-collect.timer sysstat-summary.timer
 
 %triggerun -- sysstat < 10.0.2-1
 # Save the current service runlevel info
@@ -85,10 +84,9 @@ fi
 
 %files -f %{name}.lang
 %doc CHANGES COPYING CREDITS README FAQ
-%config(noreplace) %{_sysconfdir}/cron.d/sysstat
 %config(noreplace) %{_sysconfdir}/sysconfig/sysstat
 %config(noreplace) %{_sysconfdir}/sysconfig/sysstat.ioconf
-%{_unitdir}/sysstat.service
+%{_unitdir}/sysstat*
 %{_bindir}/*
 %{_libdir}/sa
 %{_mandir}/man1/*
@@ -97,6 +95,11 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Tue May 27 2014 Peter Schiffer <pschiffe@redhat.com> - 10.3.1-1
+- resolves: #1077640
+  updated to 10.3.1
+  migrated to systemd timer units
+
 * Mon Jan 27 2014 Peter Schiffer <pschiffe@redhat.com> - 10.2.1-1
 - resolves: #1057547
   updated to 10.2.1