diff --git a/sysstat.crond b/sysstat.crond deleted file mode 100644 index ebb6260..0000000 --- a/sysstat.crond +++ /dev/null @@ -1,5 +0,0 @@ -# run system activity accounting tool every 10 minutes -*/10 * * * * root /usr/lib/sa/sa1 1 1 -# generate a daily summary of process accounting at 23:53 -53 23 * * * root /usr/lib/sa/sa2 -A - diff --git a/sysstat.spec b/sysstat.spec index c76b7b8..2cac0d6 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,13 +1,11 @@ Name: sysstat Version: 8.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The sar and iostat system monitoring commands -License: GPL +License: GPLv2+ Group: Applications/System URL: http://perso.orange.fr/sebastien.godard/ Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 -Source1: sysstat.crond -Source3: sysstat.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,35 +21,27 @@ activity. %prep %setup -q +iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux +mv CREDITS.aux CREDITS %build # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and # send the upstream maintainer a patch. # add DOCDIR to the configure part -./configure --disable-man-group --prefix=%{_prefix} --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa +./configure --disable-man-group --prefix=%{_prefix} --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa --libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\"" make CFLAGS="$CFLAGS" LFLAGS="" DOC_DIR=%{_docdir}/%{name}-%{version} -# Thou shalt not write to source files or patches -rm -f sysstat.crond -%if %_lib == "lib64" -perl -p -e "s|/lib/|/lib64/|g" %{SOURCE1} > sysstat.crond -%else -cat %{SOURCE1} > sysstat.crond -%endif - %install rm -rf %{buildroot} make install IGNORE_MAN_GROUP=y DOC_DIR=%{_docdir}/%{name}-%{version} INIT_DIR=%{_initrddir} -mkdir -p %{buildroot}/etc/{cron.daily,cron.d,sysconfig} +mkdir -p %{buildroot}/etc/cron.d install -m 0644 sysstat.crond %{buildroot}/etc/cron.d/sysstat -install -m 0644 %{SOURCE3} %{buildroot}/etc/sysconfig/sysstat mkdir -p %{buildroot}%{_initrddir} install -m 0755 sysstat %{buildroot}%{_initrddir}/ - %find_lang %{name} %post @@ -82,6 +72,12 @@ rm -rf %{buildroot} /var/log/sa %changelog +* Thu Nov 8 2007 Ivana Varekova - 8.0.2-2 +- change license tag +- remove sysstat.crond source (add -d) +- remove obsolete sysconfig file +- spec file cleanup + * Mon Nov 5 2007 Ivana Varekova - 8.0.2-1 - update 8.0.2 - spec file cleanup @@ -213,7 +209,7 @@ rm -rf %{buildroot} * Tue Jan 20 2004 Nils Philippsen 5.0.0-0.4 - fix insecure tmp files in scripts (#78212) - require tools needed in scripts -- use IFNAMSIZ from %{_includedir}/linux/if.h for maximum interface length +- use IFNAMSIZ from {_includedir}/linux/if.h for maximum interface length * Mon Jan 12 2004 Nils Philippsen 5.0.0-0.3 - Buildrequires: perl diff --git a/sysstat.sysconfig b/sysstat.sysconfig deleted file mode 100644 index 5aeb175..0000000 --- a/sysstat.sysconfig +++ /dev/null @@ -1,2 +0,0 @@ -# How long to keep log files (days), maximum is a month -HISTORY=7