From 4a24341c85616caa9acf1897de70403f2d30f24a Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Oct 24 2007 07:07:28 +0000 Subject: remoce useless patches --- diff --git a/sysstat-5.0.5-append-msg.patch b/sysstat-5.0.5-append-msg.patch deleted file mode 100644 index e6671d2..0000000 --- a/sysstat-5.0.5-append-msg.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- sysstat-5.0.5/sadc.c.append-msg 2004-09-29 13:15:48.000000000 -0400 -+++ sysstat-5.0.5/sadc.c 2004-09-29 13:21:27.000000000 -0400 -@@ -747,7 +747,9 @@ - create_sa_file(ofd, ofile, file_stats_size, flags); - return; - } -- fprintf(stderr, _("Cannot append data to that file\n")); -+ fprintf(stderr, _("Cannot append data to %s," -+ " cpu count changed from %d to %d\n"), -+ ofile, file_hdr.sa_proc, cpu_nr); - exit(1); - } - diff --git a/sysstat-7.0.4-links.patch b/sysstat-7.0.4-links.patch deleted file mode 100644 index e24e258..0000000 --- a/sysstat-7.0.4-links.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up sysstat-8.0.1/sa2.in.pom sysstat-8.0.1/sa2.in ---- sysstat-8.0.1/sa2.in.pom 2007-09-08 14:18:25.000000000 +0200 -+++ sysstat-8.0.1/sa2.in 2007-10-22 18:50:25.000000000 +0200 -@@ -48,9 +48,9 @@ DFILE=${CURRENTDIR}/${CURRENTFILE} - cd ${ENDIR} - [ -L ${RPT} ] && rm -f ${RPT} - ${ENDIR}/sar $* -f ${DFILE} > ${RPT} --find ${DDIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ -+find ${DDIR}/ \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ - -mtime +"${HISTORY}" -exec rm -f {} \; --find ${DDIR} \( -name 'sar??' -o -name 'sa??' \) -type f -mtime +"${COMPRESSAFTER}" \ -+find ${DDIR}/ \( -name 'sar??' -o -name 'sa??' \) -type f -mtime +"${COMPRESSAFTER}" \ - -exec gzip -9 {} \; > /dev/null 2>&1 - # Remove broken links - for f in `find ${DDIR} \( -name 'sar??' -o -name 'sa??' \) -type l`; do diff --git a/sysstat.spec b/sysstat.spec index 43e2fe6..85c3d63 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,6 +1,6 @@ Name: sysstat Version: 8.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The sar and iostat system monitoring commands License: GPL Group: Applications/System @@ -9,8 +9,6 @@ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 Source1: sysstat.crond Source3: sysstat.sysconfig Patch3: sysstat-7.0.4-statreset.patch -Patch6: sysstat-5.0.5-append-msg.patch -Patch11: sysstat-7.0.4-links.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,8 +25,6 @@ activity. %prep %setup -q %patch3 -p1 -b .statreset -%patch6 -p1 -b .append-msg -%patch11 -p1 -b .link %build # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and @@ -91,6 +87,9 @@ rm -rf %{buildroot} /var/log/sa %changelog +* Wed Oct 24 2007 Ivana Varekova - 8.0.1-2 +- remove useless patches + * Mon Oct 22 2007 Ivana Varekova - 8.0.1-1 - update to 8.0.1 - remove useless patches