X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sysstat.spec;h=767148ec1e6fc10747ff771a0803147778b5a656;hb=d332249d0874eed039b02599e5fe29b2a77b0ed3;hp=92cf7942183d13ed950aef1a33b2071569bb47e4;hpb=46adc211ce70acb9aa3c573c4f4d0dd98296c836;p=packages%2Fsysstat.git

diff --git a/sysstat.spec b/sysstat.spec
index 92cf794..767148e 100644
--- 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 12.1.x released (development version).
+# Sysstat 12.0.x released (stable version).
 Name:		sysstat
-Version:	10.1.6
-Release:	5
+Version:	12.0.2
+Release:	4
 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:	b67be921c4641737c5042b966215571d
 Source2:	%{name}.init
-Patch0:		%{name}-opt.patch
+Source3:	crontab
+Patch1:		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:	systemd-units >= 38
+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
@@ -53,7 +62,7 @@ sieciowych i innych operacji wejścia/wyjścia.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
@@ -62,17 +71,19 @@ sieciowych i innych operacji wejścia/wyjścia.
 	history=28 \
 	compressafter=31 \
 	cron_owner=root \
-	cron_interval=10 \
-	sa_lib_dir=%{_libdir}/sa \
+	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}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags}" \
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,12 +92,13 @@ install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d,sysconfig},/var/log/sa,%{sys
 %{__make} install \
 	CHOWN=/bin/true \
 	SYSTEMCTL=/bin/true \
-	SYSTEMD_UNIT_DIR=$RPM_BUILD_ROOT%{systemdunitdir} \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install -p sysstat.service $RPM_BUILD_ROOT%{systemdunitdir}
+	SYSTEMD_UNIT_DIR=%{systemdunitdir} \
+	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}
 
@@ -113,28 +125,53 @@ 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
-%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
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sysstat.ioconf
 %{systemdunitdir}/sysstat.service
+%{systemdunitdir}/sysstat-collect.service
+%{systemdunitdir}/sysstat-collect.timer
+%{systemdunitdir}/sysstat-summary.service
+%{systemdunitdir}/sysstat-summary.timer
 %{_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*
@@ -142,3 +179,4 @@ fi
 %{_mandir}/man8/sa1.8*
 %{_mandir}/man8/sa2.8*
 %{_mandir}/man8/sadc.8*
+%attr(750,root,root) %dir /var/log/sa