- 7.1.6

Changed files:
    sysstat-opt.patch -> 1.7
    sysstat.spec -> 1.69

diff --git a/sysstat-opt.patch b/sysstat-opt.patch
index 44b58134255bd9890dff69ee077b07360f32daa8..bcb8aa13c9ee169e9efd37e990d6d55a9018f6ff 100644 (file)
--- a/sysstat-opt.patch
+++ b/sysstat-opt.patch
@@ -1,37 +1,17 @@
---- sysstat-6.1.2/Makefile.orig        2006-04-30 11:00:53.725281750 +0200
-+++ sysstat-6.1.2/Makefile     2006-04-30 11:00:50.133057250 +0200
-@@ -24,10 +24,7 @@
- endif
- DESTDIR = $(RPM_BUILD_ROOT)
- BIN_DIR = $(PREFIX)/bin
--ifndef MAN_DIR
--# Don't use $(PREFIX)/share/man by default: not necessarily in man path!
--MAN_DIR = $(PREFIX)/man
--endif
-+MAN_DIR = $(PREFIX)/share/man
- MAN1_DIR = $(MAN_DIR)/man1
- MAN8_DIR = $(MAN_DIR)/man8
- DOC_DIR = $(PREFIX)/doc/sysstat-$(VERSION)
-@@ -35,8 +32,8 @@
- SYSCONFIG_DIR = /etc/sysconfig
- 
- # Compiler flags
--CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
--LFLAGS = -s
-+override CFLAGS += -Wall -Wstrict-prototypes -pipe -fno-strength-reduce
-+override LFLAGS += -s
- SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
- 
- # NLS (National Language Support)
-@@ -45,11 +42,7 @@
- # The msgfmt command
- MSGFMT = msgfmt
+--- sysstat-7.1.6/Makefile.in_ 2007-07-09 21:37:30.325210569 +0000
++++ sysstat-7.1.6/Makefile.in  2007-07-09 21:37:24.336947388 +0000
+@@ -75,14 +75,7 @@
+ CRON_OWNER = @CRON_OWNER@
  
+ MAN_GROUP = @MAN_GROUP@
 -ifndef IGNORE_MAN_GROUP
--MANGRPARG = -g $(MAN_GROUP)
--else
+-IGNORE_MAN_GROUP = @IGNORE_MAN_GROUP@
+-endif
+-ifeq ($(IGNORE_MAN_GROUP),y)
  MANGRPARG =
+-else
+-MANGRPARG = -g $(MAN_GROUP)
 -endif
- 
- # Run-command directories
- ifndef RC_DIR
+ ifndef CLEAN_SA_DIR
+ CLEAN_SA_DIR = @CLEAN_SA_DIR@
+ endif

diff --git a/sysstat.spec b/sysstat.spec
index 8fc42abaa1c6aea7b8bcfba47798bc4493a1be9a..f610ea0a8728eabb4f93bdb6d0c70a66b86f5e99 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -4,17 +4,19 @@ Summary(ru.UTF-8):    Содержит программы системного мо
 Summary(uk.UTF-8):     Містить команди системного моніторингу sar та iostat
 Summary(zh_CN.UTF-8):  sar, iostat 等系统监视工具
 Name:          sysstat
-Version:       6.1.2
-Release:       1
+Version:       7.1.6
+Release:       0.1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
-# Source0-md5: be8ec50b87a4a8f5fa90fd5010611cb5
+# Source0-md5: 7376033a34f8a9286e70a65217985ef7
 Source1:       %{name}.crond
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-opt.patch
 URL:           http://perso.wanadoo.fr/sebastien.godard/
+BuildRequires: autoconf
+BuildRequires: libtool
 BuildRequires: gettext-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
@@ -52,16 +54,12 @@ sieciowych i innych operacji wejścia/wyjścia.
 %patch0 -p1
 
 %build
-echo "%{_prefix}
-%{_prefix}/lib/sa
-/var/log/sa
-n
-y
-n
-y
-7
-`id -gn`
-n" | /bin/sh build/Configure.sh
+
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%configure
 
 %{__make} \
        CC="%{__cc}" \