- updated to 6.1.2

Changed files:
    sysstat-opt.patch -> 1.6
    sysstat.spec -> 1.65

diff --git a/sysstat-opt.patch b/sysstat-opt.patch
index eb00eda7b589262b65925b2ceda2a786e308ab0c..44b58134255bd9890dff69ee077b07360f32daa8 100644 (file)
--- a/sysstat-opt.patch
+++ b/sysstat-opt.patch
@@ -1,29 +1,29 @@
-diff -burN sysstat-5.1.4.orig/Makefile sysstat-5.1.4/Makefile
---- sysstat-5.1.4.orig/Makefile        2005-01-05 10:42:16.648518936 +0100
-+++ sysstat-5.1.4/Makefile     2005-01-05 10:51:13.930839608 +0100
-@@ -26,9 +26,7 @@
+--- 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)
-@@ -36,8 +34,8 @@
+@@ -35,8 +32,8 @@
  SYSCONFIG_DIR = /etc/sysconfig
  
  # Compiler flags
 -CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
--LFLAGS = -L. -lsyscom -s
+-LFLAGS = -s
 +override CFLAGS += -Wall -Wstrict-prototypes -pipe -fno-strength-reduce
-+override LFLAGS += -L. -lsyscom
- LSAFLAG = -lsyssa
++override LFLAGS += -s
  SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
  
-@@ -47,11 +45,7 @@
+ # NLS (National Language Support)
+@@ -45,11 +42,7 @@
  # The msgfmt command
  MSGFMT = msgfmt
  

diff --git a/sysstat.spec b/sysstat.spec
index 79184b501e59c7661dde8e4b5221b866b0de73a1..4a9c5f93841f6d8a6e8cc7b8f5c6d299a0d40291 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -4,12 +4,12 @@ Summary(ru):  
 Summary(uk):   í¦ÓÔÉÔØ ËÏÍÁÎÄÉ ÓÉÓÔÅÍÎÏÇÏ ÍÏΦÔÏÒÉÎÇÕ sar ÔÁ iostat
 Summary(zh_CN):        sar, iostat µÈϵͳ¼àÊÓ¹¤¾ß
 Name:          sysstat
-Version:       6.0.1
-Release:       2
+Version:       6.1.2
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
-# Source0-md5: 42670b66b01b830f82e86117659cd43d
+# Source0-md5: be8ec50b87a4a8f5fa90fd5010611cb5
 Source1:       %{name}.crond
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig