From 1063d7765b584ceacaf2466db96a9d3500411398 Mon Sep 17 00:00:00 2001 From: Ivana Hutarova Varekova Date: Mon, 4 Apr 2011 15:59:25 +0200 Subject: [PATCH] remove obsolete patch --- sysstat-9.0.6.1-sec.patch | 12 ------------ sysstat.spec | 7 ++++--- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 sysstat-9.0.6.1-sec.patch diff --git a/sysstat-9.0.6.1-sec.patch b/sysstat-9.0.6.1-sec.patch deleted file mode 100644 index 0fc5837..0000000 --- a/sysstat-9.0.6.1-sec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sysstat-9.0.6.1/sa_common.c.pom sysstat-9.0.6.1/sa_common.c ---- sysstat-9.0.6.1/sa_common.c.pom 2009-10-17 15:08:07.000000000 +0200 -+++ sysstat-9.0.6.1/sa_common.c 2010-07-19 08:37:43.000000000 +0200 -@@ -207,7 +207,7 @@ int next_slice(unsigned long long uptime - pt1 = (entry / interval) * interval; - pt2 = ((entry / interval) + 1) * interval; - -- return (((pt1 >= min) && (pt1 < max)) || ((pt2 >= min) && (pt2 < max))); -+ return (((pt1 >= min) && (pt1 <= max)) || ((pt2 >= min) && (pt2 <= max))); - } - - /* diff --git a/sysstat.spec b/sysstat.spec index 1d841f5..c922a24 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,12 +1,11 @@ Name: sysstat Version: 10.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The sar and iostat system monitoring commands License: GPLv2+ Group: Applications/System URL: http://perso.orange.fr/sebastien.godard/ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 -Patch4: sysstat-9.0.6.1-sec.patch # fixes #643380 Patch11: sysstat-10.0.0-cpu.patch Patch12: sysstat-10.0.0-makefile.patch @@ -26,7 +25,6 @@ activity. %prep %setup -q -%patch4 -p1 -b .sec %patch11 -p1 -b .cpu %patch12 -p1 -b .ls iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux @@ -77,6 +75,9 @@ rm -rf %{buildroot} %{_localstatedir}/log/sa %changelog +* Mon Apr 4 2011 Ivana Hutarova Varekova - 10.0.0-2 +- remove unnecessary patch + * Mon Apr 4 2011 Ivana Hutarova Varekova - 10.0.0-1 - update to 10.0.0 remove obsolete patches