Hello community, here is the log from the commit of package sysstat for openSUSE:Factory checked in at 2013-11-05 13:53:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-30 15:54:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysstat.new/sysstat.changes 2013-11-05 13:53:29.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 4 12:05:12 UTC 2013 - [email protected] + +- update to 10.2.0 + * This version mainly focuses on pidstat, with several bug fixes + and the addition of a new option (-v) enabling the user to + display the number of threads and file descriptors associated + with tasks. +- refreshed some of the patches +- move the lib64 patching from %prep (overwrites service unit on + every quilt setup) + +------------------------------------------------------------------- Old: ---- sysstat-10.0.5.tar.bz2 New: ---- sysstat-10.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysstat.spec ++++++ --- /var/tmp/diff_new_pack.ylVCzn/_old 2013-11-05 13:53:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ylVCzn/_new 2013-11-05 13:53:30.000000000 +0100 @@ -17,13 +17,13 @@ Name: sysstat -Version: 10.0.5 +Version: 10.2.0 Release: 0 Summary: Sar and Iostat Commands for Linux License: GPL-2.0+ Group: System/Monitoring Url: http://pagesperso-orange.fr/sebastien.godard/ -Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2 +Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz Source1: isag.desktop Source2: sysstat.cron.suse Source4: sysstat.service @@ -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 +BuildRequires: xz Requires: gettext Requires: procmail %{?systemd_requires} @@ -74,10 +75,6 @@ %patch2 %patch3 %patch4 -# patch correct libdir path in service unit -if [ "%{_libdir}" != "/usr/lib" ]; then - sed -i 's:/usr/lib:%{_libdir}:' %{S:4} -fi cp %{SOURCE1} %{SOURCE2} %{SOURCE4} . %build @@ -102,14 +99,16 @@ 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 -# change /usr/lib to /usr/lib64 or something else when needed -if [ "%{_libdir}" != "/usr/lib" ]; then - sed -i 's:/usr/lib/:%{_libdir}/:g' %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron -fi -ln -sf /sbin/service %{buildroot}%{_sbindir}/rcsysstat +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcsysstat %find_lang %{name} install -d %{buildroot}%{_localstatedir}/lock/sa %{buildroot}%{_unitdir} install -D -m 0644 %{S:4} %{buildroot}%{_unitdir}/sysstat.service +# change /usr/lib to /usr/lib64 or something else when needed +if [ "%{_libdir}" != "/usr/lib" ]; then + sed -i 's:/usr/lib/:%{_libdir}/:g' \ + %{buildroot}%{_sysconfdir}/sysstat/sysstat.cron \ + %{buildroot}%{_unitdir}/sysstat.service +fi %pre %service_add_pre sysstat.service @@ -126,7 +125,7 @@ %files -f "%{name}.lang" %defattr(-,root,root) -%doc CHANGES COPYING CREDITS FAQ README TODO +%doc CHANGES COPYING CREDITS FAQ README %doc %{_mandir}/man1/* %doc %{_mandir}/man5/* %doc %{_mandir}/man8/* @@ -136,12 +135,12 @@ %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.cron %attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.ioconf %{_bindir}/* -%{_sbindir}/* %exclude %{_bindir}/isag %{_libdir}/sa %{_unitdir}/sysstat.service %ghost %dir %{_localstatedir}/lock/sa %dir %{_localstatedir}/log/sa +%{_sbindir}/rcsysstat %files isag %defattr(-,root,root) ++++++ sysstat-8.0.4-pagesize.diff ++++++ --- /var/tmp/diff_new_pack.ylVCzn/_old 2013-11-05 13:53:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ylVCzn/_new 2013-11-05 13:53:30.000000000 +0100 @@ -1,6 +1,8 @@ ---- common.h -+++ common.h -@@ -125,8 +125,8 @@ +Index: common.h +=================================================================== +--- common.h.orig 2013-09-13 09:01:47.000000000 +0200 ++++ common.h 2013-11-04 13:02:30.115239489 +0100 +@@ -140,8 +140,8 @@ extern unsigned int kb_shift; * kB <-> number of pages. * Page size depends on machine architecture (4 kB, 8 kB, 16 kB, 64 kB...) */ @@ -9,5 +11,5 @@ +#define KB_TO_PG(k) ((k) / (getpagesize()/1024) ) +#define PG_TO_KB(k) ((k) * (getpagesize()/1024) ) - /* - *************************************************************************** + /* Type of persistent device names used in sar and iostat */ + extern char persistent_name_type[MAX_FILE_LEN]; ++++++ sysstat-8.0.4-sysconfdir.diff ++++++ --- /var/tmp/diff_new_pack.ylVCzn/_old 2013-11-05 13:53:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ylVCzn/_new 2013-11-05 13:53:30.000000000 +0100 @@ -1,6 +1,8 @@ ---- FAQ -+++ FAQ -@@ -419,9 +419,9 @@ +Index: FAQ +=================================================================== +--- FAQ.orig 2013-11-04 13:00:33.520958755 +0100 ++++ FAQ 2013-11-04 13:00:34.808972906 +0100 +@@ -422,9 +422,9 @@ to verify that for yourself. Nor do you have to be concerned about using up all your disk space. sar will use a few hundred kilobytes for a whole day's worth of data, and it normally only stores one week worth (this can be configured via the HISTORY @@ -12,7 +14,7 @@ configuration file. ~~~ -@@ -461,7 +461,7 @@ +@@ -464,7 +464,7 @@ another file or create a new one. See al By default sar saves its data in the standard system activity data file, the /var/log/sa/sa<DD> file, where <DD> is the current day in the month. To prevent sar from overwriting any existing files, just set the variable @@ -21,16 +23,18 @@ must be kept. When this variable has a value greater than 28, sa1 script uses a month-by-month directory structure; datafiles are named YYYYMM/saDD and the script maintains links to these datafiles to mimic the standard ---- README -+++ README -@@ -83,8 +83,8 @@ - ${PREFIX}/share/doc/sysstat-x.y.z/* +Index: README +=================================================================== +--- README.orig 2013-11-04 13:00:34.808972906 +0100 ++++ README 2013-11-04 13:01:12.750389712 +0100 +@@ -82,8 +82,8 @@ ${PREFIX}/share/doc/sysstat-x.y.z/* /var/log/sa ${INIT_DIR}/sysstat + /lib/systemd/system/sysstat.service if OS uses systemd -/etc/sysconfig/sysstat -/etc/sysconfig/sysstat.ioconf +/etc/sysstat/sysstat +/etc/sysstat/sysstat.ioconf /etc/cron.d/sysstat - /etc/rc.d/rc.sysstat for [SLACKWARE] + /etc/rc.d/rc.sysstat (depending on your distro) ${RC_DIR}/rc2.d/S03sysstat ++++++ sysstat-8.1.6-sa1sa2lock.diff ++++++ --- /var/tmp/diff_new_pack.ylVCzn/_old 2013-11-05 13:53:30.000000000 +0100 +++ /var/tmp/diff_new_pack.ylVCzn/_new 2013-11-05 13:53:30.000000000 +0100 @@ -1,16 +1,14 @@ Index: sa1.in =================================================================== ---- sa1.in.orig -+++ sa1.in -@@ -30,17 +30,24 @@ then - rm -f ${CURRENTFILE} - ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE} +--- sa1.in.orig 2013-11-04 12:58:07.434353548 +0100 ++++ sa1.in 2013-11-04 13:00:20.173812120 +0100 +@@ -40,16 +40,22 @@ else + [ -f ${CURRENTFILE} ] && [ "`date +%Y%m -r ${CURRENTFILE}`" -lt "${CURRENTDIR}" ] && rm -f ${CURRENTFILE} fi + +set -e - umask 0022 ENDIR=@SA_LIB_DIR@ cd ${ENDIR} -+ +LOCKFILE=/var/run/sysstat/sadc.LOCK +mkdir -p /var/run/sysstat +lockfile -r2 -30 "$LOCKFILE" 2>/dev/null @@ -31,8 +29,8 @@ Index: sa2.in =================================================================== ---- sa2.in.orig -+++ sa2.in +--- sa2.in.orig 2013-11-04 12:58:06.615344546 +0100 ++++ sa2.in 2013-11-04 12:58:07.435353559 +0100 @@ -48,6 +48,17 @@ ENDIR=@bindir@ DFILE=${CURRENTDIR}/${CURRENTFILE} [ -f "$DFILE" ] || exit 0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
