rel 5; store one record every 2 minutes instead of starting once every hour and store...

[packages/sysstat.git] / sysstat.spec

diff --git a/sysstat.spec b/sysstat.spec
index ff77b3d44253cee2008ab66693e876fcf63e5a1f..287ca165eda53cf64201b50b6ef57827a66910e6 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,23 +1,3 @@
-# TODO:
-# - if running at systemd, cron job is not neccessary (it has the timers)
-# - make upgrade cleaner than it is now. after upgrade sysstat does not work until data file is changed for next day:
-# I sysstat-11.0.8-3.x86_64
-# R sysstat-10.1.6-5.x86_64
-# # sar -q
-# Invalid system activity file: /var/log/sa/sa13
-# File created by sar/sadc from sysstat version 10.1.6
-# Current sysstat version can no longer read the format of this file (0x2171)
-#
-# # service sysstat restart
-# System Activity Data Collector service is not running.
-# Starting System Activity Data Collector service....................[ FAIL ]
-# sensors_init: Kernel interface error
-# Invalid system activity file: /var/log/sa/sa13
-# File created by sar/sadc from sysstat version 10.1.6
-# Current sysstat version can no longer read the format of this file (0x2171)
-#
-# So add automatic conversion using sadf (see howto on project page)
-# after update to version >= 11.1
 #
 # Fix or remove  install.patch (seems systemd files are installed now)
 Summary:       The sar and iostat system monitoring commands
@@ -26,15 +6,15 @@ Summary(ru.UTF-8):   Содержит программы системного мо
 Summary(uk.UTF-8):     Містить команди системного моніторингу sar та iostat
 Summary(zh_CN.UTF-8):  sar, iostat 等系统监视工具
 # use stable versions
-# Sysstat 11.3.x (development version).
-# Sysstat 11.2.x (stable version).
+# Sysstat 12.1.x released (development version).
+# Sysstat 12.0.x released (stable version).
 Name:          sysstat
-Version:       11.2.0
-Release:       1
+Version:       12.0.2
+Release:       5
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
-# Source0-md5: e8b615775ad98780e3f0675b91eddb19
+# Source0-md5: b67be921c4641737c5042b966215571d
 Source2:       %{name}.init
 Source3:       crontab
 Patch1:                install.patch
@@ -47,9 +27,10 @@ BuildRequires:       rpmbuild(macros) >= 1.671
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires(post,preun):  /sbin/chkconfig
-Requires:      crondaemon
+Requires:      cronjobs
 Requires:      rc-scripts
 Requires:      systemd-units >= 38
+Requires:      xz
 Obsoletes:     iostat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -90,13 +71,15 @@ sieciowych i innych operacji wejścia/wyjścia.
        history=28 \
        compressafter=31 \
        cron_owner=root \
-       cron_interval=10 \
+       cron_interval=2 \
+       sadc_options='-L -S XDISK' \
        sa_lib_dir=%{_libexecdir} \
+       ZIP=%{_bindir}/xz \
        --enable-install-cron \
        --disable-stripping \
        --with-systemdsystemunitdir=%{systemdunitdir}
 
-%{__sed} -i 's/SADC_OPTIONS=""/SADC_OPTIONS="-L"/' sysstat.sysconfig
+%{__sed} -i 's/SADC_OPTIONS=""/SADC_OPTIONS="-L -S XDISK"/' sysstat.sysconfig
 
 %{__make} -j1 \
        CC="%{__cc}" \
@@ -142,9 +125,29 @@ fi
 %triggerpostun -- %{name} < 10.1.6-1
 %systemd_trigger sysstat.service
 
+%triggerpostun -- %{name} < 11.7.1-1
+C=0
+for log in /var/log/sa/sa[0-9]*; do
+       if (LC_ALL=C %{_bindir}/sadf -C "$log" 2>&1 | grep -q "Current sysstat version cannot read the format of this file"); then
+               echo "Converting file $log to current format: "
+               if (%{_bindir}/sadf -c "$log" > "$log.migrate"); then
+                       chown --reference "$log" "$log.migrate"
+                       chmod --reference "$log" "$log.migrate"
+                       mv "$log.migrate" "$log"
+                       C=1
+               else
+                       echo "$log MIGRATION FAILED." >&2
+               fi
+       fi
+done
+if [ "$C" -eq 1 ]; then
+       %service sysstat restart
+       %systemd_post sysstat.service
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS README FAQ
+%doc CHANGES CREDITS README.md FAQ.md
 %attr(755,root,root) %{_bindir}/cifsiostat
 %attr(755,root,root) %{_bindir}/iostat
 %attr(755,root,root) %{_bindir}/mpstat