Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2014-01-29 07:17:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysstat (Old) and /work/SRC/openSUSE:Factory/.sysstat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysstat" Changes: -------- --- /work/SRC/openSUSE:Factory/sysstat/sysstat.changes 2013-11-05 13:53:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2014-01-29 07:17:14.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Jan 27 12:06:13 UTC 2014 - [email protected] + +- update to 10.2.1 + * Added new --enable-copy-only option to configure script. + This option may be useful when creating sysstat package to + make sure that files are only copied to $DESTDIR and that + no service is activated (eg. for distro using systemd). + * pidstat: Add a new metric to pidstat I/O statistics: + per-task block I/O delays. + * Take $DESTDIR variable into account when installing sysstat + service used by systemd. + * sadf -H, sadf -j and sadf -x now also display the file + creation time. + * Use sizeof() instead of hardcoded size values. + * pidstat manual page updated. + * Cosmetic fixes. + * NLS updated. +- rename nfsiostat to nfsiostat-sysstat because of a name collision + with a binary from nfs-utils (bnc#814447) + * added sysstat-rename_nfsiostat.patch + +------------------------------------------------------------------- Old: ---- sysstat-10.2.0.tar.xz New: ---- sysstat-10.2.1.tar.xz sysstat-rename_nfsiostat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.TkmC3T/_old 2014-01-29 07:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.TkmC3T/_new 2014-01-29 07:17:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysstat # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: sysstat -Version: 10.2.0 +Version: 10.2.1 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ @@ -39,6 +39,7 @@ Patch3: sysstat-8.0.4-sysconfdir.diff # PATCH-FIX-OPENSUSE avoid build dates in generated files Patch4: sysstat-9.0.4-no-build-date.patch +Patch5: sysstat-rename_nfsiostat.patch BuildRequires: xz Requires: gettext Requires: procmail @@ -76,6 +77,11 @@ %patch3 %patch4 cp %{SOURCE1} %{SOURCE2} %{SOURCE4} . +# bnc814447: rename nfsiostat to nfsiostat-sysstat +%patch5 -p1 +mv man/nfsiostat.in man/nfsiostat-sysstat.in +mv nfsiostat.c nfsiostat-sysstat.c +mv nfsiostat.h nfsiostat-sysstat.h %build export conf_dir="%{_sysconfdir}/sysstat" ++++++ sysstat-10.2.0.tar.xz -> sysstat-10.2.1.tar.xz ++++++ ++++ 3783 lines of diff (skipped) ++++++ sysstat-rename_nfsiostat.patch ++++++ commit 0b97789cd6b10bca691a9bf43b7cf95cc4fdf384 Author: Sebastien GODARD <[email protected]> Date: Sun Jan 26 09:17:03 2014 +0100 Rename nfsiostat command to nfsiostat-sysstat nfsiostat was added to the sysstat package in 2010, but such a command has already existed in the nfs-utils package since 2008. So to avoid confusion, rename nfsiostat to nfsiostat-sysstat and indicate it is now obsolete. The nfsiostat command from the sysstat package will be removed in a future version since we don't need two similar commands. Signed-off-by: Sebastien GODARD <[email protected]> Index: sysstat-10.2.1/Makefile.in =================================================================== --- sysstat-10.2.1.orig/Makefile.in 2014-01-27 13:16:53.480367396 +0100 +++ sysstat-10.2.1/Makefile.in 2014-01-27 13:17:27.744767704 +0100 @@ -163,7 +163,7 @@ NLSPOT= $(NLSPO:.po=.pot) % : %.o $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS) -all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales +all: sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat locales common.o: common.c version.h common.h ioconf.h sysconfig.h @@ -247,9 +247,9 @@ mpstat.o: mpstat.c mpstat.h version.h co mpstat: mpstat.o librdstats_light.a libsyscom.a -nfsiostat.o: nfsiostat.c nfsiostat.h count.h version.h common.h +nfsiostat-sysstat.o: nfsiostat-sysstat.c nfsiostat-sysstat.h count.h version.h common.h -nfsiostat: nfsiostat.o librdstats_light.a libsyscom.a +nfsiostat-sysstat: nfsiostat-sysstat.o librdstats_light.a libsyscom.a cifsiostat.o: cifsiostat.c cifsiostat.h count.h version.h common.h @@ -291,8 +291,8 @@ ifeq ($(INSTALL_DOC),y) $(INSTALL_DATA) $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR) rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1* $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR) - rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1* - $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat.1 $(DESTDIR)$(MAN1_DIR) + rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1* + $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat-sysstat.1 $(DESTDIR)$(MAN1_DIR) rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1* $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR) ifeq ($(INSTALL_ISAG),y) @@ -308,7 +308,7 @@ ifeq ($(COMPRESS_MANPG),y) $(ZIP) $(DESTDIR)$(MAN1_DIR)/iostat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1 - $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat.1 + $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1 $(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1 ifeq ($(INSTALL_ISAG),y) $(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1 @@ -348,7 +348,7 @@ endif $(INSTALL_BIN) iostat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR) - $(INSTALL_BIN) nfsiostat $(DESTDIR)$(BIN_DIR) + $(INSTALL_BIN) nfsiostat-sysstat $(DESTDIR)$(BIN_DIR) $(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR) ifeq ($(INSTALL_ISAG),y) $(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR) @@ -419,7 +419,7 @@ ifeq ($(INSTALL_DOC),y) rm -f $(DESTDIR)$(MAN1_DIR)/iostat.1* rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1* rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1* - rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1* + rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1* rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1* ifeq ($(INSTALL_ISAG),y) rm -f $(DESTDIR)$(MAN1_DIR)/isag.1 @@ -447,7 +447,7 @@ uninstall_base: uninstall_man uninstall_ rm -f $(DESTDIR)$(BIN_DIR)/iostat rm -f $(DESTDIR)$(BIN_DIR)/mpstat rm -f $(DESTDIR)$(BIN_DIR)/pidstat - rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat + rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat-sysstat rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat ifeq ($(INSTALL_ISAG),y) rm -f $(DESTDIR)$(BIN_DIR)/isag @@ -513,7 +513,7 @@ po-files: endif clean: - rm -f sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat *.o *.a core TAGS + rm -f sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat *.o *.a core TAGS find nls -name "*.gmo" -exec rm -f {} \; almost-distclean: clean nls/sysstat.pot @@ -522,7 +522,7 @@ almost-distclean: clean nls/sysstat.pot rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in rm -f contrib/isag/isag rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5 - rm -f man/cifsiostat.1 man/nfsiostat.1 + rm -f man/cifsiostat.1 man/nfsiostat-sysstat.1 rm -f *.log config.status rm -rf autom4te.cache rm -f *.save *.old .*.swp data Index: sysstat-10.2.1/configure =================================================================== --- sysstat-10.2.1.orig/configure 2014-01-27 13:16:53.481367408 +0100 +++ sysstat-10.2.1/configure 2014-01-27 13:16:55.461390542 +0100 @@ -5432,7 +5432,7 @@ ac_config_files="$ac_config_files man/io # File must be renamed ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in" # File must be renamed -ac_config_files="$ac_config_files man/nfsiostat.1:man/nfsiostat.in" +ac_config_files="$ac_config_files man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" # File must be renamed ac_config_files="$ac_config_files contrib/isag/isag" # Permissions must be changed @@ -6165,7 +6165,7 @@ do "man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;; "man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;; "man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;; - "man/nfsiostat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat.1:man/nfsiostat.in" ;; + "man/nfsiostat-sysstat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" ;; "contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; Index: sysstat-10.2.1/configure.in =================================================================== --- sysstat-10.2.1.orig/configure.in 2014-01-27 13:16:53.481367408 +0100 +++ sysstat-10.2.1/configure.in 2014-01-27 13:16:55.461390542 +0100 @@ -608,7 +608,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in]) AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in]) # File must be renamed AC_CONFIG_FILES([man/iostat.1:man/iostat.in]) # File must be renamed AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in]) # File must be renamed -AC_CONFIG_FILES([man/nfsiostat.1:man/nfsiostat.in]) # File must be renamed +AC_CONFIG_FILES([man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in]) # File must be renamed AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed AC_OUTPUT(Makefile) Index: sysstat-10.2.1/nfsiostat.c =================================================================== --- sysstat-10.2.1.orig/nfsiostat.c 2014-01-27 13:16:55.461390542 +0100 +++ sysstat-10.2.1/nfsiostat.c 2014-01-27 13:17:42.992945828 +0100 @@ -28,7 +28,7 @@ #include <sys/utsname.h> #include "version.h" -#include "nfsiostat.h" +#include "nfsiostat-sysstat.h" #include "count.h" #include "common.h" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
