Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at Tue Jun 28 09:35:42 CEST 2011.
-------- --- sysstat/sysstat.changes 2011-03-07 12:37:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysstat/sysstat.changes 2011-06-27 14:50:07.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 27 12:40:36 UTC 2011 - pu...@novell.com + +- update to sysstat-10.0.1 + - see /usr/share/doc/packages/sysstat/CHANGES for + full list of changes +- update patches +- get rid of obsolete --disable-smp-race configure option +- use --enable-debug-info configure option +- install /var/lock/sa as ghost file +- use spec-cleaner + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sysstat-9.0.6.1.tar.bz2 New: ---- sysstat-10.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.KmsM73/_old 2011-06-28 09:26:01.000000000 +0200 +++ /var/tmp/diff_new_pack.KmsM73/_new 2011-06-28 09:26:01.000000000 +0200 @@ -15,13 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: sysstat -Version: 9.0.6.1 -Release: 16 +Version: 10.0.1 +Release: 1 +License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Sar and Iostat Commands for Linux +Url: http://pagesperso-orange.fr/sebastien.godard/ +Group: System/Monitoring Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 Source1: isag.desktop Source2: sysstat.cron.suse @@ -41,15 +43,15 @@ Patch4: sysstat-do-not-strip.patch # PATCH-FIX-OPENSUSE avoid build dates in generated files Patch5: sysstat-9.0.4-no-build-date.patch -Url: http://pagesperso-orange.fr/sebastien.godard/ -Group: System/Monitoring -License: GNU General Public License version 2 or later (GPL v2 or later) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: procmail gettext -PreReq: %insserv_prereq PreReq: %fillup_prereq +PreReq: %insserv_prereq +Requires: gettext +Requires: procmail +BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: findutils sed update-desktop-files +BuildRequires: findutils +BuildRequires: sed +BuildRequires: update-desktop-files %description Sar and Iostat commands for Linux. The sar command collects and reports @@ -59,28 +61,19 @@ inspection. Both commands now support SMP machines when displaying CPU utilization. - -Authors: --------- - Sebastien Godard <sebastien.god...@wanadoo.fr> - %package isag License: GNU General Public License version 2 or later (GPL v2 or later) Summary: Interactive System Activity Grapher for sysstat -Requires: sysstat = %{version} -Requires: gnuplot tk Group: System/Monitoring +Requires: gnuplot +Requires: sysstat = %{version} +Requires: tk %description isag This package includes the isag command, which graphically displays the system activity data stored in a binary data produced by a sar command from a sysstat package. - -Authors: --------- - Sebastien Godard <sebastien.god...@wanadoo.fr> - %prep %setup -q %patch0 @@ -97,27 +90,27 @@ export LFLAGS="-L. -lsyscom" %configure \ --enable-nls \ - --disable-smp-race \ - --enable-man-group + --disable-man-group \ + --enable-debug-info make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/sa $RPM_BUILD_ROOT%{_sbindir} -make DESTDIR=$RPM_BUILD_ROOT install -install -D -m 0644 isag.desktop $RPM_BUILD_ROOT%{_datadir}/applications/isag.desktop +mkdir -p %{buildroot}%{_localstatedir}/log/sa %{buildroot}%{_sbindir} +%make_install +install -D -m 0644 isag.desktop %{buildroot}%{_datadir}/applications/isag.desktop %suse_update_desktop_file isag -cp contrib/isag/isag $RPM_BUILD_ROOT%{_bindir} -cp contrib/isag/isag.1 $RPM_BUILD_ROOT%{_mandir}/man1 -rm -rf $RPM_BUILD_ROOT/usr/share/doc/sysstat* -install -D -m 0755 sysstat.cron.suse $RPM_BUILD_ROOT%{_sysconfdir}/sysstat/sysstat.cron -install -D -m 0755 sysstat.init.suse $RPM_BUILD_ROOT%{_sysconfdir}/init.d/boot.sysstat +cp contrib/isag/isag %{buildroot}%{_bindir} +cp contrib/isag/isag.1 %{buildroot}%{_mandir}/man1 +rm -rf %{buildroot}%{_datadir}/doc/sysstat* +install -D -m 0755 sysstat.cron.suse %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron +install -D -m 0755 sysstat.init.suse %{buildroot}%{_sysconfdir}/init.d/boot.sysstat # change /usr/lib to /usr/lib64 or something else when needed if [ "%{_libdir}" != "/usr/lib" ]; then - sed -i 's:/usr/lib/:%{_libdir}/:g' $RPM_BUILD_ROOT%{_sysconfdir}/init.d/boot.sysstat $RPM_BUILD_ROOT%{_sysconfdir}/sysstat/sysstat.cron + sed -i 's:/usr/lib/:%{_libdir}/:g' %{buildroot}%{_sysconfdir}/init.d/boot.sysstat %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron fi -ln -s %{_sysconfdir}/init.d/boot.sysstat $RPM_BUILD_ROOT%{_sbindir}/rcsysstat +ln -s %{_sysconfdir}/init.d/boot.sysstat %{buildroot}%{_sbindir}/rcsysstat %find_lang %{name} -install -d $RPM_BUILD_ROOT%{_localstatedir}/lock/sa +install -d %{buildroot}%{_localstatedir}/lock/sa %preun %{stop_on_removal boot.sysstat} @@ -130,12 +123,13 @@ %{insserv_cleanup} %clean -%__rm -rf "%{buildroot}" +rm -rf %{buildroot} %files -f "%{name}.lang" %defattr(-,root,root) %doc CHANGES COPYING CREDITS FAQ README TODO %doc %{_mandir}/man1/* +%doc %{_mandir}/man5/* %doc %{_mandir}/man8/* %exclude %{_mandir}/man1/isag* %dir %{_sysconfdir}/sysstat @@ -147,7 +141,7 @@ %{_sbindir}/* %exclude %{_bindir}/isag %{_libdir}/sa -%dir %{_localstatedir}/lock/sa +%ghost %dir %{_localstatedir}/lock/sa %dir %{_localstatedir}/log/sa %files isag ++++++ sysstat-9.0.6.1.tar.bz2 -> sysstat-10.0.1.tar.bz2 ++++++ ++++ 34268 lines of diff (skipped) ++++++ sysstat-8.1.6-sa1sa2lock.diff ++++++ --- /var/tmp/diff_new_pack.KmsM73/_old 2011-06-28 09:26:01.000000000 +0200 +++ /var/tmp/diff_new_pack.KmsM73/_new 2011-06-28 09:26:01.000000000 +0200 @@ -1,6 +1,8 @@ ---- sa1.in +Index: sa1.in +=================================================================== +--- sa1.in.orig +++ sa1.in -@@ -29,17 +29,24 @@ +@@ -30,17 +30,24 @@ then rm -f ${CURRENTFILE} ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE} fi @@ -20,16 +22,18 @@ # Note: Stats are written at the end of previous file *and* at the # beginning of the new one (when there is a file rotation) only if # outfile has been specified as '-' on the command line... -- exec ${ENDIR}/sadc -F -L 1 1 - -+ ${ENDIR}/sadc -F -L 1 1 - +- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 - ++ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 - else -- exec ${ENDIR}/sadc -F -L $* - -+ ${ENDIR}/sadc -F -L $* - +- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* - ++ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* - fi ---- sa2.in +Index: sa2.in +=================================================================== +--- sa2.in.orig +++ sa2.in -@@ -48,6 +48,17 @@ +@@ -48,6 +48,17 @@ ENDIR=@bindir@ DFILE=${CURRENTDIR}/${CURRENTFILE} [ -f "$DFILE" ] || exit 0 cd ${ENDIR} ++++++ sysstat-9.0.4-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.KmsM73/_old 2011-06-28 09:26:01.000000000 +0200 +++ /var/tmp/diff_new_pack.KmsM73/_new 2011-06-28 09:26:01.000000000 +0200 @@ -1,8 +1,8 @@ Index: sadf.c =================================================================== ---- sadf.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ sadf.c 2010-08-29 14:06:25.844317816 -0400 -@@ -42,7 +42,7 @@ +--- sadf.c.orig ++++ sadf.c +@@ -43,7 +43,7 @@ # define _(string) (string) #endif @@ -13,10 +13,10 @@ long interval = -1, count = 0; Index: sadc.c =================================================================== ---- sadc.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ sadc.c 2010-08-29 14:06:57.871131439 -0400 -@@ -47,7 +47,7 @@ - #define _(string) (string) +--- sadc.c.orig ++++ sadc.c +@@ -52,7 +52,7 @@ + #include "sensors/error.h" #endif -#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ @@ -26,9 +26,9 @@ long interval = 0; Index: pidstat.c =================================================================== ---- pidstat.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ pidstat.c 2010-08-29 14:07:28.747150121 -0400 -@@ -42,7 +42,7 @@ +--- pidstat.c.orig ++++ pidstat.c +@@ -43,7 +43,7 @@ #define _(string) (string) #endif @@ -39,8 +39,8 @@ unsigned long long uptime[3] = {0, 0, 0}; Index: mpstat.c =================================================================== ---- mpstat.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ mpstat.c 2010-08-29 14:08:37.905123377 -0400 +--- mpstat.c.orig ++++ mpstat.c @@ -41,7 +41,7 @@ #define _(string) (string) #endif @@ -52,8 +52,8 @@ unsigned long long uptime[3] = {0, 0, 0}; Index: sar.c =================================================================== ---- sar.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ sar.c 2010-08-29 14:08:11.349260508 -0400 +--- sar.c.orig ++++ sar.c @@ -40,7 +40,7 @@ #define _(string) (string) #endif @@ -65,8 +65,8 @@ /* Interval and count parameters */ Index: iostat.c =================================================================== ---- iostat.c.orig 2009-07-18 09:19:57.000000000 -0400 -+++ iostat.c 2010-08-29 14:09:05.997206556 -0400 +--- iostat.c.orig ++++ iostat.c @@ -47,7 +47,7 @@ #define _(string) (string) #endif @@ -76,3 +76,29 @@ char *sccsid(void) { return (SCCSID); } struct stats_cpu *st_cpu[2]; +Index: cifsiostat.c +=================================================================== +--- cifsiostat.c.orig ++++ cifsiostat.c +@@ -40,7 +40,7 @@ + #define _(string) (string) + #endif + +-#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ ++#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ + char *sccsid(void) { return (SCCSID); } + + unsigned long long uptime[2] = {0, 0}; +Index: nfsiostat.c +=================================================================== +--- nfsiostat.c.orig ++++ nfsiostat.c +@@ -39,7 +39,7 @@ + #define _(string) (string) + #endif + +-#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__ ++#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ + char *sccsid(void) { return (SCCSID); } + + unsigned long long uptime[2] = {0, 0}; ++++++ sysstat-do-not-strip.patch ++++++ --- /var/tmp/diff_new_pack.KmsM73/_old 2011-06-28 09:26:01.000000000 +0200 +++ /var/tmp/diff_new_pack.KmsM73/_new 2011-06-28 09:26:01.000000000 +0200 @@ -1,13 +1,13 @@ -Index: sysstat-9.0.4/Makefile.in +Index: sysstat-10.0.1/Makefile.in =================================================================== ---- sysstat-9.0.4.orig/Makefile.in 2009-06-20 16:11:03.000000000 +0200 -+++ sysstat-9.0.4/Makefile.in 2010-05-28 14:12:00.000000000 +0200 -@@ -63,7 +63,7 @@ SYSCONFIG_DIR = @SYSCONFIG_DIR@ +--- sysstat-10.0.1.orig/Makefile.in ++++ sysstat-10.0.1/Makefile.in +@@ -71,7 +71,7 @@ SYSCONFIG_DIR = @SYSCONFIG_DIR@ # Compiler flags CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 DFLAGS = @DFLAGS@ -LFLAGS = -s -+LFLAGS = - # DFLAGS may already contain SMP_RACE definition ++LFLAGS = DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" + DFLAGS += $(DFSENSORS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org