- updated to 5.1.4

Changed files:
    sysstat-norwegian.patch -> 1.8
    sysstat-opt.patch -> 1.4
    sysstat.spec -> 1.55

diff --git a/sysstat-norwegian.patch b/sysstat-norwegian.patch
index 85c3cea14a5a6337acf1c33775577a56cd62df58..1f1919cd8c24625e83f2e1823a30b9f9ee62f535 100644 (file)
--- a/sysstat-norwegian.patch
+++ b/sysstat-norwegian.patch
@@ -1,6 +1,7 @@
---- Makefile~  2004-11-19 02:27:37.260634792 +0000
-+++ Makefile   2004-11-19 02:29:16.819499544 +0000
-@@ -133,7 +133,7 @@
+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:47:37.723708088 +0100
+@@ -156,7 +156,7 @@
                -e s+SA_LIB_DIR/+$(SA_LIB_DIR)/+g $< > $@
  
  ifdef REQUIRE_NLS
@@ -9,23 +10,42 @@
  else
  locales:
  endif
-@@ -156,11 +156,11 @@
+@@ -179,10 +179,10 @@
  nls/ja.gmo: nls/ja.po
-       $(MSGFMT) -o nls/ja.gmo nls/ja.po
+       $(MSGFMT) -o $@ $<
  
 -nls/nb_NO.gmo: nls/nb_NO.po
--      $(MSGFMT) -o nls/nb_NO.gmo nls/nb_NO.po
 +nls/nb.gmo: nls/nb.po
-+      $(MSGFMT) -o nls/nb.gmo nls/nb.po
+       $(MSGFMT) -o $@ $<
  
 -nls/nn_NO.gmo: nls/nn_NO.po
--      $(MSGFMT) -o nls/nn_NO.gmo nls/nn_NO.po
 +nls/nn.gmo: nls/nn.po
-+      $(MSGFMT) -o nls/nn.gmo nls/nn.po
+       $(MSGFMT) -o $@ $<
  
  nls/pl.gmo: nls/pl.po
-       $(MSGFMT) -o nls/pl.gmo nls/pl.po
-@@ -213,8 +213,8 @@
+@@ -243,8 +243,8 @@
+       mkdir -p $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES
+       mkdir -p $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES
+       mkdir -p $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/nb_NO/LC_MESSAGES
+-      mkdir -p $(DESTDIR)$(NLS_DIR)/nn_NO/LC_MESSAGES
++      mkdir -p $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES
++      mkdir -p $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES
+       mkdir -p $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES
+       mkdir -p $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES
+       mkdir -p $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES
+@@ -256,8 +256,8 @@
+       install -m 644 nls/fr.gmo $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES/$(PACKAGE).mo
+       install -m 644 nls/it.gmo $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES/$(PACKAGE).mo
+       install -m 644 nls/ja.gmo $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES/$(PACKAGE).mo
+-      install -m 644 nls/nb_NO.gmo $(DESTDIR)$(NLS_DIR)/nb_NO/LC_MESSAGES/$(PACKAGE).mo
+-      install -m 644 nls/nn_NO.gmo $(DESTDIR)$(NLS_DIR)/nn_NO/LC_MESSAGES/$(PACKAGE).mo
++      install -m 644 nls/nb.gmo $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES/$(PACKAGE).mo
++      install -m 644 nls/nn.gmo $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES/$(PACKAGE).mo
+       install -m 644 nls/pl.gmo $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES/$(PACKAGE).mo
+       install -m 644 nls/pt.gmo $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES/$(PACKAGE).mo
+       install -m 644 nls/ro.gmo $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES/$(PACKAGE).mo
+@@ -316,8 +316,8 @@
        rm -f $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES/$(PACKAGE).mo
        rm -f $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES/$(PACKAGE).mo
        rm -f $(DESTDIR)$(PREFIX)/share/locale/ja/LC_MESSAGES/$(PACKAGE).mo
@@ -36,7 +56,7 @@
        rm -f $(DESTDIR)$(PREFIX)/share/locale/pl/LC_MESSAGES/$(PACKAGE).mo
        rm -f $(DESTDIR)$(PREFIX)/share/locale/pt/LC_MESSAGES/$(PACKAGE).mo
        rm -f $(DESTDIR)$(PREFIX)/share/locale/ro/LC_MESSAGES/$(PACKAGE).mo
-@@ -226,8 +226,8 @@
+@@ -329,8 +329,8 @@
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/fr/LC_MESSAGES
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/it/LC_MESSAGES
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/ja/LC_MESSAGES
@@ -47,7 +67,7 @@
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/pl/LC_MESSAGES
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/pt/LC_MESSAGES
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/ro/LC_MESSAGES
-@@ -239,8 +239,8 @@
+@@ -342,8 +342,8 @@
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/fr
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/it
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/ja
@@ -58,25 +78,3 @@
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/pl
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/pt
        -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/locale/ro
-@@ -294,8 +294,8 @@
-       mkdir -p $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES
-       mkdir -p $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES
-       mkdir -p $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES
--      mkdir -p $(DESTDIR)$(NLS_DIR)/nb_NO/LC_MESSAGES
--      mkdir -p $(DESTDIR)$(NLS_DIR)/nn_NO/LC_MESSAGES
-+      mkdir -p $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES
-+      mkdir -p $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES
-       mkdir -p $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES
-       mkdir -p $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES
-       mkdir -p $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES
-@@ -307,8 +307,8 @@
-       install -m 644 nls/fr.gmo $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES/$(PACKAGE).mo
-       install -m 644 nls/it.gmo $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES/$(PACKAGE).mo
-       install -m 644 nls/ja.gmo $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES/$(PACKAGE).mo
--      install -m 644 nls/nb_NO.gmo $(DESTDIR)$(NLS_DIR)/nb_NO/LC_MESSAGES/$(PACKAGE).mo
--      install -m 644 nls/nn_NO.gmo $(DESTDIR)$(NLS_DIR)/nn_NO/LC_MESSAGES/$(PACKAGE).mo
-+      install -m 644 nls/nb.gmo $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES/$(PACKAGE).mo
-+      install -m 644 nls/nn.gmo $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES/$(PACKAGE).mo
-       install -m 644 nls/pl.gmo $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES/$(PACKAGE).mo
-       install -m 644 nls/pt.gmo $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES/$(PACKAGE).mo
-       install -m 644 nls/ro.gmo $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES/$(PACKAGE).mo

diff --git a/sysstat-opt.patch b/sysstat-opt.patch
index 54532c64923114f2c0ac93c6d166283195fb5390..47448e47a99863de4005d2d41b3077d3fa2ffbca 100644 (file)
--- a/sysstat-opt.patch
+++ b/sysstat-opt.patch
@@ -1,6 +1,7 @@
---- sysstat-4.0.3/Makefile.orig        Sat Dec 29 17:48:18 2001
-+++ sysstat-4.0.3/Makefile     Tue Jan 29 00:03:13 2002
-@@ -26,17 +26,15 @@
+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 @@
  endif
  DESTDIR = $(RPM_BUILD_ROOT)
  BIN_DIR = $(PREFIX)/bin
@@ -11,17 +12,18 @@
  MAN1_DIR = $(MAN_DIR)/man1
  MAN8_DIR = $(MAN_DIR)/man8
  DOC_DIR = $(PREFIX)/doc/sysstat-$(VERSION)
- NLS_DIR = $(PREFIX)/share/locale
+@@ -36,8 +34,8 @@
+ SYSCONFIG_DIR = /etc/sysconfig
  
  # Compiler flags
 -CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
--LFLAGS = -L. -lsysstat -lsa -s
-+CFLAGS = -Wall -Wstrict-prototypes -pipe $(OPT_FLAGS) -fno-strength-reduce
-+LFLAGS = -L. -lsysstat -lsa
- SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\"
+-LFLAGS = -L. -lsyscom -s
++CFLAGS = -Wall -Wstrict-prototypes -pipe $(OPTFLAGS) -fno-strength-reduce
++LFLAGS = -L. -lsyscom
+ LSAFLAG = -lsyssa
+ SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
  
- # NLS (National Language Support)
-@@ -43,11 +41,7 @@
+@@ -47,11 +45,7 @@
  # The msgfmt command
  MSGFMT = msgfmt
  
@@ -33,5 +35,3 @@
  
  # Run-command directories
  ifndef RC_DIR
---- Makefile~  2004-11-19 02:24:25.167837336 +0000
-+++ Makefile   2004-11-19 02:26:36.417884296 +0000

diff --git a/sysstat.spec b/sysstat.spec
index 53b2dca92a66191f5cd9db4b667779ec44d48903..88cfec91743a7c71c75f2a55d02298c3abccaf9c 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:       5.1.2
+Version:       5.1.4
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
-# Source0-md5: 9043be730f534f0f8a07f1252f663022
+# Source0-md5: 5bf58e6fad0e1f71d586318622406093
 Source1:       %{name}.crond
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -50,7 +50,7 @@ sieciowych i innych operacji wej
 %prep
 %setup -q
 %patch0 -p1
-%patch1
+%patch1 -p1
 
 mv -f nls/nb_NO.po nls/nb.po
 mv -f nls/nn_NO.po nls/nn.po