- updated to 11.6.3

diff --git a/sysstat-install.patch b/sysstat-install.patch
index 5b492cc93aac343bcd012d004805f936130f3763..641066b785546bf4418e48d1e723e27e31104fb0 100644 (file)
--- a/sysstat-install.patch
+++ b/sysstat-install.patch
@@ -1,29 +1,36 @@
-diff -ur sysstat-10.1.6.orig/Makefile.in sysstat-10.1.6/Makefile.in
---- sysstat-10.1.6.orig/Makefile.in    2013-06-08 06:54:53.000000000 +0000
-+++ sysstat-10.1.6/Makefile.in 2015-07-30 10:18:06.617616347 +0000
-@@ -367,25 +367,8 @@
-           $(SYSTEMCTL) enable sysstat.service; \
+diff -ur sysstat-11.6.3.orig/Makefile.in sysstat-11.6.3/Makefile.in
+--- sysstat-11.6.3.orig/Makefile.in    2018-04-06 09:54:07.000000000 +0000
++++ sysstat-11.6.3/Makefile.in 2018-04-11 10:28:29.934643892 +0000
+@@ -426,32 +426,8 @@
+               $(INSTALL_DATA) cron/sysstat-summary.timer $(DESTDIR)$(SYSTEMD_UNIT_DIR); \
        elif [ -d $(DESTDIR)$(INIT_DIR) ]; then \
-          $(INSTALL_BIN) sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \
--         if [ -x $(CHKCONFIG) ]; then \
--            cd $(DESTDIR)$(INIT_DIR) && $(CHKCONFIG) --add sysstat; \
--         else \
--            cd $(DESTDIR)$(RC2_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
--            cd $(DESTDIR)$(RC3_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
--            cd $(DESTDIR)$(RC5_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
--         fi \
+               $(INSTALL_BIN) sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \
+-              if [ "$(COPY_ONLY)" == "n" ]; then \
+-                      if [ -x "$(CHKCONFIG)" ]; then \
+-                              cd $(DESTDIR)$(INIT_DIR) && $(CHKCONFIG) --add sysstat; \
+-                      else \
+-                              [ -d $(DESTDIR)$(RC2_DIR) ] || mkdir -p $(DESTDIR)$(RC2_DIR); \
+-                              [ -d $(DESTDIR)$(RC3_DIR) ] || mkdir -p $(DESTDIR)$(RC3_DIR); \
+-                              [ -d $(DESTDIR)$(RC5_DIR) ] || mkdir -p $(DESTDIR)$(RC5_DIR); \
+-                              cd $(DESTDIR)$(RC2_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
+-                              cd $(DESTDIR)$(RC3_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
+-                              cd $(DESTDIR)$(RC5_DIR) && $(LN_S) -f ../$(INITD_DIR)/sysstat S01sysstat; \
+-                      fi \
+-              fi \
        elif [ -d $(DESTDIR)$(RC_DIR) ]; then \
-          $(INSTALL_BIN) sysstat $(DESTDIR)$(RC_DIR)/rc.sysstat; \
--         if [ -x $(CHKCONFIG) ]; then \
--            cd $(DESTDIR)$(RC_DIR) && $(CHKCONFIG) --add sysstat; \
--         else \
--            [ -d $(DESTDIR)$(RC2_DIR) ] || mkdir -p $(DESTDIR)$(RC2_DIR); \
--            [ -d $(DESTDIR)$(RC3_DIR) ] || mkdir -p $(DESTDIR)$(RC3_DIR); \
--            [ -d $(DESTDIR)$(RC5_DIR) ] || mkdir -p $(DESTDIR)$(RC5_DIR); \
--            cd $(DESTDIR)$(RC2_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
--            cd $(DESTDIR)$(RC3_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
--            cd $(DESTDIR)$(RC5_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
--         fi \
+               $(INSTALL_BIN) sysstat $(DESTDIR)$(RC_DIR)/rc.sysstat; \
+-              if [ "$(COPY_ONLY)" == "n" ]; then \
+-                      if [ -x "$(CHKCONFIG)" ]; then \
+-                              cd $(DESTDIR)$(RC_DIR) && $(CHKCONFIG) --add rc.sysstat; \
+-                      else \
+-                              [ -d $(DESTDIR)$(RC2_DIR) ] || mkdir -p $(DESTDIR)$(RC2_DIR); \
+-                              [ -d $(DESTDIR)$(RC3_DIR) ] || mkdir -p $(DESTDIR)$(RC3_DIR); \
+-                              [ -d $(DESTDIR)$(RC5_DIR) ] || mkdir -p $(DESTDIR)$(RC5_DIR); \
+-                              cd $(DESTDIR)$(RC2_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
+-                              cd $(DESTDIR)$(RC3_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
+-                              cd $(DESTDIR)$(RC5_DIR) && $(LN_S) -f ../rc.sysstat S01sysstat; \
+-                      fi \
+-              fi \
        fi
- 
- uninstall_man:
+ ifeq ($(COPY_ONLY),n)
+       if [ -x "$(SYSTEMCTL)" ]; then \

diff --git a/sysstat-opt.patch b/sysstat-opt.patch
deleted file mode 100644 (file)
index bcb8aa1..0000000
--- a/sysstat-opt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sysstat-7.1.6/Makefile.in_ 2007-07-09 21:37:30.325210569 +0000
-+++ sysstat-7.1.6/Makefile.in  2007-07-09 21:37:24.336947388 +0000
-@@ -75,14 +75,7 @@
- CRON_OWNER = @CRON_OWNER@
- 
- MAN_GROUP = @MAN_GROUP@
--ifndef IGNORE_MAN_GROUP
--IGNORE_MAN_GROUP = @IGNORE_MAN_GROUP@
--endif
--ifeq ($(IGNORE_MAN_GROUP),y)
- MANGRPARG =
--else
--MANGRPARG = -g $(MAN_GROUP)
--endif
- ifndef CLEAN_SA_DIR
- CLEAN_SA_DIR = @CLEAN_SA_DIR@
- endif

diff --git a/sysstat.spec b/sysstat.spec
index 511e748918bf0bdec6bae11f3086a3081e5cbe63..3a7d320db06c818639f9b320bc50f27c5343c2cc 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,32 +1,41 @@
-# TODO:
-# - solve conflict (obsoletes?):
-#   file /usr/bin/iostat from install of sysstat-10.1.6-3.i686 conflicts with file from package iostat-2.2-1.i686
+#
+# 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.7.x (development version).
+# Sysstat 11.6.x (stable version).
+# Sysstat 11.4.x (stable version).
 Name:          sysstat
-Version:       10.1.6
-Release:       7
+Version:       11.6.3
+Release:       1
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
-# Source0-md5: 61792b2591e4b3adcb7b979af2330fba
+Source0:       http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
+# Source0-md5: 066968aad1f0861d572170943a389c3f
 Source2:       %{name}.init
-Patch0:                %{name}-opt.patch
-Patch1:                %{name}-install.patch
+Source3:       crontab
+Patch0:                %{name}-install.patch
 URL:           http://perso.wanadoo.fr/sebastien.godard/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 BuildRequires: gettext-tools
 BuildRequires: lm_sensors-devel
 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:      xz
+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
@@ -54,7 +63,6 @@ sieciowych i innych operacji wejścia/wyjścia.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -64,7 +72,8 @@ 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} \
+       ZIP=%{_bindir}/xz \
        --enable-install-cron \
        --disable-stripping
 
@@ -72,7 +81,7 @@ sieciowych i innych operacji wejścia/wyjścia.
 
 %{__make} -j1 \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,9 +90,12 @@ install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d,sysconfig},/var/log/sa}
 %{__make} install \
        CHOWN=/bin/true \
        SYSTEMCTL=/bin/true \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       IGNORE_MAN_GROUP=y \
+       IGNORE_FILE_ATTRIBUTES=y
 
-%{__sed} -e 's|/usr/lib/sa|%{_libdir}/sa|g' %{SOURCE2} >$RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
+install -p %{SOURCE2} $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}
 
@@ -102,19 +114,39 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del sysstat
 fi
 
+%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
+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
-%attr(755,root,root) %{_bindir}/nfsiostat
+%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
@@ -122,7 +154,7 @@ fi
 %{_mandir}/man1/cifsiostat.1*
 %{_mandir}/man1/iostat.1*
 %{_mandir}/man1/mpstat.1*
-%{_mandir}/man1/nfsiostat.1*
+%{_mandir}/man1/tapestat.1*
 %{_mandir}/man1/pidstat.1*
 %{_mandir}/man1/sadf.1*
 %{_mandir}/man1/sar.1*
@@ -130,3 +162,4 @@ fi
 %{_mandir}/man8/sa1.8*
 %{_mandir}/man8/sa2.8*
 %{_mandir}/man8/sadc.8*
+%attr(750,root,root) %dir /var/log/sa