fix cron definiton, broken since sysstat-11.0.8-2

[packages/sysstat.git] / sysstat.spec

diff --git a/sysstat.spec b/sysstat.spec
index 51f865891edb772f89bef8419c3e6d4af1a8d33b..f2dc26e0ea4b7e34cf9da4f5ba85cca9d65906a9 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,23 +1,24 @@
 # TODO:
 # - if running at systemd, cron job is not neccessary (it has the timers)
+#
+# Fix or remove  install.patch (seems systemd files are installed now)
 Summary:       The sar and iostat system monitoring commands
 Summary(pl.UTF-8):     Polecenia sar i iostat dla systemu Linux
 Summary(ru.UTF-8):     Содержит программы системного мониторинга sar и iostat
 Summary(uk.UTF-8):     Містить команди системного моніторингу sar та iostat
 Summary(zh_CN.UTF-8):  sar, iostat 等系统监视工具
 # use stable versions
-# Sysstat 11.1.x (development version).
-# Sysstat 11.0.x (stable version).
+# Sysstat 11.3.x (development version).
+# Sysstat 11.2.x (stable version).
 Name:          sysstat
-Version:       11.0.8
-Release:       2
+Version:       11.2.0
+Release:       4
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
-# Source0-md5: 9a60d786c928b4006f1445c71eeb0e3d
+# Source0-md5: e8b615775ad98780e3f0675b91eddb19
 Source2:       %{name}.init
 Source3:       crontab
-Patch0:                %{name}-opt.patch
 Patch1:                install.patch
 URL:           http://perso.wanadoo.fr/sebastien.godard/
 BuildRequires: autoconf >= 2.53
@@ -34,6 +35,8 @@ Requires:     systemd-units >= 38
 Obsoletes:     iostat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _libexecdir     %{_prefix}/lib/sa
+
 %description
 This package provides the sar and iostat commands for the Linux
 operating system, similar to their traditional UNIX counterparts. They
@@ -60,7 +63,6 @@ sieciowych i innych operacji wejścia/wyjścia.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -71,7 +73,7 @@ sieciowych i innych operacji wejścia/wyjścia.
        compressafter=31 \
        cron_owner=root \
        cron_interval=10 \
-       sa_lib_dir=%{_libdir}/sa \
+       sa_lib_dir=%{_libexecdir} \
        --enable-install-cron \
        --disable-stripping \
        --with-systemdsystemunitdir=%{systemdunitdir}
@@ -80,7 +82,7 @@ sieciowych i innych operacji wejścia/wyjścia.
 
 %{__make} -j1 \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,11 +92,11 @@ install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d,sysconfig},/var/log/sa,%{sys
        CHOWN=/bin/true \
        SYSTEMCTL=/bin/true \
        SYSTEMD_UNIT_DIR=%{systemdunitdir} \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       IGNORE_MAN_GROUP=y \
+       IGNORE_FILE_ATTRIBUTES=y
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
-%{__sed} i -e 's|/usr/lib/sa|%{_libdir}/sa|g' $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
-
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}
@@ -122,19 +124,40 @@ fi
 %triggerpostun -- %{name} < 10.1.6-1
 %systemd_trigger sysstat.service
 
+%triggerpostun -- %{name} < 11.2.0-2
+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
 %attr(755,root,root) %{_bindir}/cifsiostat
 %attr(755,root,root) %{_bindir}/iostat
 %attr(755,root,root) %{_bindir}/mpstat
-%attr(755,root,root) %{_bindir}/nfsiostat-sysstat
+%attr(755,root,root) %{_bindir}/tapestat
 %attr(755,root,root) %{_bindir}/pidstat
 %attr(755,root,root) %{_bindir}/sadf
 %attr(755,root,root) %{_bindir}/sar
-%dir %{_libdir}/sa
-%attr(755,root,root) %{_libdir}/sa/sa*
-%attr(750,root,root) %dir /var/log/sa
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/sa1
+%attr(755,root,root) %{_libexecdir}/sa2
+%attr(755,root,root) %{_libexecdir}/sadc
 %attr(754,root,root) /etc/rc.d/init.d/sysstat
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/sysstat
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sysstat
@@ -147,7 +170,7 @@ fi
 %{_mandir}/man1/cifsiostat.1*
 %{_mandir}/man1/iostat.1*
 %{_mandir}/man1/mpstat.1*
-%{_mandir}/man1/nfsiostat-sysstat.1*
+%{_mandir}/man1/tapestat.1*
 %{_mandir}/man1/pidstat.1*
 %{_mandir}/man1/sadf.1*
 %{_mandir}/man1/sar.1*
@@ -155,3 +178,4 @@ fi
 %{_mandir}/man8/sa1.8*
 %{_mandir}/man8/sa2.8*
 %{_mandir}/man8/sadc.8*
+%attr(750,root,root) %dir /var/log/sa