- update 8.0.2

- spec file cleanup
This commit is contained in:
Ivana Varekova 2007-11-05 14:25:50 +00:00
parent 4a24341c85
commit 4caa8be77f
4 changed files with 11 additions and 26 deletions

View File

@ -1 +1 @@
sysstat-8.0.1.tar.bz2
sysstat-8.0.2.tar.bz2

View File

@ -1 +1 @@
487ee172b2c029ec52ebfd2b803bf8fe sysstat-8.0.1.tar.bz2
764916f221ae80852d85fc5d7b2d4dd8 sysstat-8.0.2.tar.bz2

View File

@ -1,14 +0,0 @@
diff -up sysstat-8.0.1/sysstat.in.stat sysstat-8.0.1/sysstat.in
--- sysstat-8.0.1/sysstat.in.stat 2007-09-24 16:13:20.000000000 +0200
+++ sysstat-8.0.1/sysstat.in 2007-10-22 17:28:14.000000000 +0200
@@ -1,6 +1,9 @@
#!/bin/sh
#
-# chkconfig: 235 03 97
+# sysstat Reset the system activity logs
+#
+# chkconfig: 12345 01 99
+# short-description: Reset the system activity logs
# @INIT_DIR@/sysstat
# (C) 2000-2007 Sebastien Godard (sysstat <at> orange.fr)
#

View File

@ -1,6 +1,6 @@
Name: sysstat
Version: 8.0.1
Release: 2%{?dist}
Version: 8.0.2
Release: 1%{?dist}
Summary: The sar and iostat system monitoring commands
License: GPL
Group: Applications/System
@ -8,7 +8,6 @@ URL: http://perso.orange.fr/sebastien.godard/
Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
Source1: sysstat.crond
Source3: sysstat.sysconfig
Patch3: sysstat-7.0.4-statreset.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -24,7 +23,6 @@ activity.
%prep
%setup -q
%patch3 -p1 -b .statreset
%build
# FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and
@ -32,7 +30,7 @@ activity.
# add DOCDIR to the configure part
./configure --disable-man-group --prefix=%{_prefix} --mandir=%{_mandir} sa_lib_dir=%{_libdir}/sa
CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
make CFLAGS="$CFLAGS" LFLAGS="" DOC_DIR=%{_docdir}
make CFLAGS="$CFLAGS" LFLAGS="" DOC_DIR=%{_docdir}/%{name}-%{version}
# Thou shalt not write to source files or patches
rm -f sysstat.crond
@ -45,17 +43,14 @@ cat %{SOURCE1} > sysstat.crond
%install
rm -rf %{buildroot}
make install IGNORE_MAN_GROUP=y DOC_DIR=%{_docdir} INIT_DIR=%{_initrddir}
make install IGNORE_MAN_GROUP=y DOC_DIR=%{_docdir}/%{name}-%{version} INIT_DIR=%{_initrddir}
mkdir -p %{buildroot}/etc/{cron.daily,cron.d,sysconfig}
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}/
# sysstat makefiles install the docs in the wrong place, blow them away
rm -f %{buildroot}/usr/share/doc/*
%find_lang %{name}
@ -74,7 +69,7 @@ fi
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%defattr(-,root,root,-)
%doc CHANGES COPYING CREDITS README TODO FAQ
%config(noreplace) /etc/cron.d/sysstat
%config(noreplace) /etc/sysconfig/sysstat
@ -87,6 +82,10 @@ rm -rf %{buildroot}
/var/log/sa
%changelog
* Mon Nov 5 2007 Ivana Varekova <varekova@redhat.com> - 8.0.2-1
- update 8.0.2
- spec file cleanup
* Wed Oct 24 2007 Ivana Varekova <varekova@redhat.com> - 8.0.1-2
- remove useless patches