From: Sebastien Godard <sysstat@orange.fr>
Date: Sun, 7 Nov 2010 15:31:13 +0000 (+0100)
Subject: Version 9.1.6 final packaging
X-Git-Tag: v9.1.6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1599fb38a3570f9ca6e1a292d39a024f4a1d6e82;p=sysstat

Version 9.1.6 final packaging

Updated lsm and spec files.
Updated release date in CHANGES file.
Note that this patch also includes a small fix in spec file
where a cron file hasn't still been moved in its own subdirectory.
---

diff --git a/CHANGES b/CHANGES
index 6091d03..b8ae31e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes:
 
-xxxx/xx/xx: Version 9.1.6 - Sebastien Godard (sysstat <at> orange.fr)
+2010/11/10: Version 9.1.6 - Sebastien Godard (sysstat <at> orange.fr)
 	  WARNING: Daily data files format has changed, and is *not*
 	  compatible with the previous one! [0x2171]
 	* Added a new magical value for each activity in file.
diff --git a/nls/sysstat.pot b/nls/sysstat.pot
index a2a140d..baefe1f 100644
--- a/nls/sysstat.pot
+++ b/nls/sysstat.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-11-06 15:34+0100\n"
+"POT-Creation-Date: 2010-11-07 15:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/rd_stats.c b/rd_stats.c
index a4ffa7e..8762f0c 100644
--- a/rd_stats.c
+++ b/rd_stats.c
@@ -519,7 +519,7 @@ void read_diskstats_disk(struct stats_disk *st_disk, int nbr, int read_part)
 			   &tot_ticks, &rq_ticks) == 11) {
 			
 			if (!rd_ios && !wr_ios)
-				/* Unused device: ignore it */
+				/* Unused device: Ignore it */
 				continue;
 			if (read_part || is_device(dev_name)) {
 				st_disk_i = st_disk + dsk++;
diff --git a/sa_common.c b/sa_common.c
index 5a74ee2..d0ecc2e 100644
--- a/sa_common.c
+++ b/sa_common.c
@@ -796,7 +796,7 @@ int get_activity_nr(struct activity *act[], unsigned int option, int count_outpu
  *
  * IN:
  * @act		Array of activities.
- * 
+ *
  * OUT:
  * @act		Array of activities, all of the being selected.
  ***************************************************************************
diff --git a/sysstat-9.1.5.lsm b/sysstat-9.1.6.lsm
similarity index 91%
rename from sysstat-9.1.5.lsm
rename to sysstat-9.1.6.lsm
index 3fb87ba..0c90363 100644
--- a/sysstat-9.1.5.lsm
+++ b/sysstat-9.1.6.lsm
@@ -1,7 +1,7 @@
 Begin4
 Title:		sysstat - the sar, sadf, mpstat, iostat, nfsiostat, cifsiostat and pidstat commands for Linux
-Version:	9.1.5
-Entered-date:	2010-09-12
+Version:	9.1.6
+Entered-date:	2010-11-10
 Description:	The sysstat package contains the sar, sadf, mpstat, iostat,
 		pidstat, nfsiostat, cifsiostat and sa tools for Linux.
 		The sar command collects and reports system activity
@@ -28,10 +28,10 @@ Keywords:	system administration, sar, sadf, iostat, mpstat, pidstat, nfsiostat,
 Author:		sebastien.godard@orange.fr (Sebastien Godard)
 Maintained-by:	sebastien.godard@orange.fr (Sebastien Godard)
 Primary-site:	http://pagesperso-orange.fr/sebastien.godard/
-		309kB sysstat-9.1.5.tar.gz
-		248kB sysstat-9.1.5.tar.bz2
-		312kB sysstat-9.1.5-1.src.rpm
-		311kB sysstat-9.1.5-1.i586.rpm
+		315kB sysstat-9.1.6.tar.gz
+		250kB sysstat-9.1.6.tar.bz2
+		318kB sysstat-9.1.6-1.src.rpm
+		318kB sysstat-9.1.6-1.i586.rpm
 Alternate-site:	ibiblio.org /pub/linux/system/status
 Copying-policy:	GPL
 End
diff --git a/sysstat-9.1.5.spec b/sysstat-9.1.6.spec
similarity index 96%
rename from sysstat-9.1.5.spec
rename to sysstat-9.1.6.spec
index 870d308..743ae40 100644
--- a/sysstat-9.1.5.spec
+++ b/sysstat-9.1.6.spec
@@ -1,6 +1,6 @@
 Summary: 	SAR, SADF, MPSTAT, IOSTAT, NFSIOSTAT, CIFSIOSTAT and PIDSTAT for Linux
 Name: 		sysstat
-Version: 	9.1.5
+Version: 	9.1.6
 Release: 	1
 License: 	GPL
 Group: 		Applications/System
@@ -50,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 install -m 644 sysstat.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/sysstat
 install -m 644 sysstat.ioconf $RPM_BUILD_ROOT/etc/sysconfig/sysstat.ioconf
 mkdir -p $RPM_BUILD_ROOT/etc/cron.d
-install -m 644 sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat
+install -m 644 cron/sysstat.crond.sample $RPM_BUILD_ROOT/etc/cron.d/sysstat
 mkdir -p $RPM_BUILD_ROOT/etc/rc2.d
 cd $RPM_BUILD_ROOT/etc/rc2.d && ln -sf ../init.d/sysstat S01sysstat
 mkdir -p $RPM_BUILD_ROOT/etc/rc3.d