From cde8c9adfe7b6ceac2203e2898a3aa8175a25033 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 14 Aug 2013 14:33:13 +0200
Subject: [PATCH] Updated to 10.1.6

- resolves: #972508
  updated to 10.1.6
- resolves: #993394
  fixed FTBFS (added BR on systemd)
- install the docs in the new pkgdocdir
  (thanks to Mathieu Bridon <bochecha@fedoraproject.org> for the patch)
---
 .gitignore                    |  2 +-
 sources                       |  2 +-
 sysstat-10.0.0-makefile.patch | 13 -------------
 sysstat.spec                  | 32 +++++++++++++++++++++-----------
 4 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 sysstat-10.0.0-makefile.patch

diff --git a/.gitignore b/.gitignore
index cf6dd9a..d99beb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/sysstat-10.1.5.tar.bz2
+/sysstat-10.1.6.tar.bz2
diff --git a/sources b/sources
index fd0e371..6ea296c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f57c129b50234b25e4a7e0a363b1b72  sysstat-10.1.5.tar.bz2
+61792b2591e4b3adcb7b979af2330fba  sysstat-10.1.6.tar.bz2
diff --git a/sysstat-10.0.0-makefile.patch b/sysstat-10.0.0-makefile.patch
deleted file mode 100644
index 65f12c6..0000000
--- a/sysstat-10.0.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up sysstat-10.0.0/Makefile.in.pom sysstat-10.0.0/Makefile.in
---- sysstat-10.0.0/Makefile.in.pom	2011-03-06 16:46:23.000000000 +0100
-+++ sysstat-10.0.0/Makefile.in	2011-04-04 10:23:02.000000000 +0200
-@@ -196,8 +196,8 @@ librdsensors.a: librdsensors.a(rd_sensor
- 
- sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
- 
--sadc: LFLAGS += $(LFSENSORS)
- sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
-+	$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS) -lsensors
- 
- sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
- 
diff --git a/sysstat.spec b/sysstat.spec
index ab0b7ad..5c59952 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,20 +1,19 @@
 Summary: Collection of performance monitoring tools for Linux
 Name: sysstat
-Version: 10.1.5
-Release: 2%{?dist}
+Version: 10.1.6
+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.bz2
 
-Patch0: sysstat-10.0.0-makefile.patch
-
 Requires: /etc/cron.d, fileutils, grep, sh-utils, textutils
 Requires(post): systemd, systemd-sysv
 Requires(preun): systemd
 Requires(postun): systemd
 
 BuildRequires: %{_includedir}/linux/if.h, gettext, lm_sensors-devel, perl
+BuildRequires: systemd
 
 %description
 The sysstat package contains sar, sadf, mpstat, iostat, pidstat, nfsiostat,
@@ -35,23 +34,26 @@ The cifsiostat command reports I/O statistics for CIFS file systems.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ls
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
 %build
 %configure sa_lib_dir=%{_libdir}/sa history=28 compressafter=31 \
-    --disable-man-group
+%if 0%{?fedora} >= 20
+    --docdir=%{_pkgdocdir} \
+%endif
+    --disable-man-group --disable-stripping
 %{__sed} -i 's/SADC_OPTIONS=""/SADC_OPTIONS="-S DISK"/' sysstat.sysconfig
-CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
-make CFLAGS="$CFLAGS" LFLAGS="" %{?_smp_mflags}
+export CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
+#make %{?_smp_mflags}   # doesn't work in 10.1.6
+make
 
 %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
+mkdir -p %{buildroot}%{_sysconfdir}/cron.d
+install -m 0644 cron/sysstat.crond %{buildroot}%{_sysconfdir}/cron.d/sysstat
 
 # Install service file
 mkdir -p %{buildroot}%{_unitdir}
@@ -96,6 +98,14 @@ fi
 %{_localstatedir}/log/sa
 
 %changelog
+* Wed Aug 14 2013 Peter Schiffer <pschiffe@redhat.com> - 10.1.6-1
+- resolves: #972508
+  updated to 10.1.6
+- resolves: #993394
+  fixed FTBFS (added BR on systemd)
+- install the docs in the new pkgdocdir
+  (thanks to Mathieu Bridon <bochecha@fedoraproject.org> for the patch)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -509,7 +519,7 @@ fi
 - Summarize previous day's activity with sa2, not current day (which is only 4 hours of data when it gets run) (#24820)
 - upgrade to 3.3.4 for full 2.4 compatibility and improved iostat
 
-* Tue Jan 17 2001 Preston Brown <pbrown@redhat.com>
+* Wed Jan 17 2001 Preston Brown <pbrown@redhat.com>
 - iostat man page fixes
 
 * Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>