This commit is contained in:
parent
6de22f2b47
commit
95c94e1ec8
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85215cdee9974416d0268f5a5a10f8b80f499bd2d02b92639120fa9252e7efd4
|
||||
size 158359
|
@ -1,6 +1,6 @@
|
||||
--- nls/af.po
|
||||
+++ nls/af.po
|
||||
@@ -144,8 +144,8 @@
|
||||
@@ -142,8 +142,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -13,7 +13,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- nls/de.po
|
||||
+++ nls/de.po
|
||||
@@ -142,8 +142,8 @@
|
||||
@@ -140,8 +140,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -26,7 +26,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- nls/es.po
|
||||
+++ nls/es.po
|
||||
@@ -144,8 +144,8 @@
|
||||
@@ -142,8 +142,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -39,7 +39,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- nls/fr.po
|
||||
+++ nls/fr.po
|
||||
@@ -144,8 +144,8 @@
|
||||
@@ -142,8 +142,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -52,7 +52,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- nls/it.po
|
||||
+++ nls/it.po
|
||||
@@ -142,8 +142,8 @@
|
||||
@@ -140,8 +140,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -65,7 +65,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- nls/pt.po
|
||||
+++ nls/pt.po
|
||||
@@ -144,8 +144,8 @@
|
||||
@@ -142,8 +142,8 @@
|
||||
"[ -d ] [ -F ] [ -I ] [ -V ]\n"
|
||||
|
||||
#: sadc.c:614
|
||||
@ -78,7 +78,7 @@
|
||||
msgid "Cannot handle so many processors!\n"
|
||||
--- sadc.c
|
||||
+++ sadc.c
|
||||
@@ -654,7 +654,7 @@
|
||||
@@ -655,7 +655,7 @@
|
||||
create_sa_file(ofd, ofile, file_stats_size, flags);
|
||||
return;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
--- sa1.in
|
||||
+++ sa1.in
|
||||
@@ -23,16 +23,22 @@
|
||||
@@ -28,17 +28,23 @@
|
||||
rm -f ${CURRENTFILE}
|
||||
ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE}
|
||||
fi
|
||||
@ -13,7 +13,8 @@
|
||||
+lockfile -r2 -30 $LOCKFILE 2>/dev/null
|
||||
+trap "rm -f $LOCKFILE" EXIT
|
||||
+
|
||||
if [ $# = 0 ]
|
||||
[ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n
|
||||
if [ $# = 0 ] && [ "$BOOT" = "n" ]
|
||||
then
|
||||
# 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
|
||||
@ -27,7 +28,7 @@
|
||||
|
||||
--- sa2.in
|
||||
+++ sa2.in
|
||||
@@ -41,6 +41,16 @@
|
||||
@@ -46,6 +46,16 @@
|
||||
DFILE=${CURRENTDIR}/${CURRENTFILE}
|
||||
[ -f "$DFILE" ] || exit 0
|
||||
cd ${ENDIR}
|
||||
@ -41,6 +42,6 @@
|
||||
+fi
|
||||
+trap "rm -f $LOCKFILE" EXIT
|
||||
+
|
||||
[ -L ${RPT} ] && rm -f ${RPT}
|
||||
${ENDIR}/sar $* -f ${DFILE} > ${RPT}
|
||||
find ${DDIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \
|
||||
-mtime +"${HISTORY}" -exec rm -f {} \;
|
@ -1,58 +1,3 @@
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -46,7 +46,7 @@
|
||||
MAN8_DIR = $(MAN_DIR)/man8
|
||||
DOC_DIR = $(PREFIX)/doc/$(PACKAGE)-$(VERSION)
|
||||
NLS_DIR = $(PREFIX)/share/locale
|
||||
-SYSCONFIG_DIR = /etc/sysconfig
|
||||
+SYSCONFIG_DIR = @sysconfdir@
|
||||
|
||||
# Compiler flags
|
||||
CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
|
||||
--- ioconf.h
|
||||
+++ ioconf.h
|
||||
@@ -20,7 +20,7 @@
|
||||
#define MAX_BLKDEV 255
|
||||
#endif
|
||||
|
||||
-#define IOCONF "/etc/sysconfig/sysstat.ioconf"
|
||||
+#define IOCONF "/etc/sysstat/sysstat.ioconf"
|
||||
|
||||
#define K_NODEV "nodev"
|
||||
|
||||
--- sa1.in
|
||||
+++ sa1.in
|
||||
@@ -9,7 +9,7 @@
|
||||
# Autoconf support added.
|
||||
#
|
||||
HISTORY=0
|
||||
-[ -r /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
|
||||
+[ -r /etc/sysstat/sysstat ] && . /etc/sysstat/sysstat
|
||||
if [ ${HISTORY} -gt 28 ]
|
||||
then
|
||||
CURRENTDIR=`date +%Y%m`
|
||||
--- sa2.in
|
||||
+++ sa2.in
|
||||
@@ -21,7 +21,7 @@
|
||||
CURRENTRPT=sar${DATE}
|
||||
HISTORY=@HISTORY@
|
||||
COMPRESSAFTER=@COMPRESSAFTER@
|
||||
-[ -r /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
|
||||
+[ -r /etc/sysstat/sysstat ] && . /etc/sysstat/sysstat
|
||||
if [ ${HISTORY} -gt 28 ]
|
||||
then
|
||||
CURRENTDIR=`date +%Y%m`
|
||||
--- sysstat.in
|
||||
+++ sysstat.in
|
||||
@@ -25,7 +25,7 @@
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start)
|
||||
- [ -r /etc/sysconfig/sysstat ] && . /etc/sysconfig/sysstat
|
||||
+ [ -r /etc/sysstat/sysstat ] && . /etc/sysstat/sysstat
|
||||
if [ ${HISTORY} -gt 28 ]
|
||||
then
|
||||
CURRENTDIR=`date +%Y%m`
|
||||
--- FAQ
|
||||
+++ FAQ
|
||||
@@ -397,9 +397,9 @@
|
3
sysstat-7.1.3.tar.bz2
Normal file
3
sysstat-7.1.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fc44bcf6eec40d600a2fe8b3c8035d855f2678f392509c8121c233026cc3d95e
|
||||
size 160488
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 17 15:07:33 CEST 2007 - prusnak@suse.cz
|
||||
|
||||
- splitted isag utility to separate subpackage sysstat-isag
|
||||
* users will not be forced to install gnuplot (and X stuff) if
|
||||
they do not want to
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 17 14:26:30 CEST 2007 - prusnak@suse.cz
|
||||
|
||||
- update to 7.1.3
|
||||
* fixed bug in hotplug cpu support
|
||||
* better support for keeping sar logfiles for more than one month
|
||||
* code cleaned
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 13 11:52:17 CET 2007 - prusnak@suse.cz
|
||||
|
||||
|
61
sysstat.spec
61
sysstat.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package sysstat (Version 7.1.2)
|
||||
# spec file for package sysstat (Version 7.1.3)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -11,10 +11,9 @@
|
||||
# norootforbuild
|
||||
|
||||
Name: sysstat
|
||||
Version: 7.1.2
|
||||
Version: 7.1.3
|
||||
Release: 1
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
Requires: gnuplot
|
||||
Requires: procmail
|
||||
Requires: gettext
|
||||
Autoreqprov: on
|
||||
@ -40,6 +39,27 @@ utilization.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Sebastien Godard <sebastien.godard@wanadoo.fr>
|
||||
|
||||
%package isag
|
||||
Requires: sysstat = %{version}
|
||||
Requires: gnuplot tk
|
||||
Group: System/Monitoring
|
||||
Autoreqprov: on
|
||||
Summary: Sar and Iostat Commands for Linux
|
||||
|
||||
%description isag
|
||||
Sar and Iostat commands for Linux. The sar command collects and reports
|
||||
system activity information. The iostat command reports CPU statistics
|
||||
and I/O statistics for TTY devices and disks. The information
|
||||
collected by sar and iostat can be saved in a binary file for future
|
||||
inspection. Both commands now support SMP machines when displaying CPU
|
||||
utilization.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Sebastien Godard <sebastien.godard@wanadoo.fr>
|
||||
@ -52,11 +72,11 @@ Authors:
|
||||
%patch3
|
||||
|
||||
%build
|
||||
export sa_lib_dir=/usr/lib/sa
|
||||
export conf_dir=%{_sysconfdir}/sysstat
|
||||
export sa_lib_dir=%{_libdir}/sa
|
||||
export cron_owner=root
|
||||
export LFLAGS="-L. -lsyscom"
|
||||
%configure \
|
||||
--sysconfdir=%{_sysconfdir}/sysstat \
|
||||
--enable-nls \
|
||||
--disable-smp-race \
|
||||
--enable-man-group
|
||||
@ -85,22 +105,43 @@ rm -f /var/log/sa/*
|
||||
%clean
|
||||
rm -rf "$RPM_BUILD_ROOT"
|
||||
|
||||
%files -f %{name}.lang
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.cron
|
||||
%attr(644,root,root) %config(noreplace) %{_sysconfdir}/sysstat/sysstat.ioconf
|
||||
%attr(755,root,root) %{_sysconfdir}/init.d/sysstat
|
||||
%doc CHANGES COPYING CREDITS FAQ README TODO sysstat-%{version}.lsm
|
||||
%doc %{_mandir}/man?/*
|
||||
%doc %{_mandir}/man1/iostat*
|
||||
%doc %{_mandir}/man1/mpstat*
|
||||
%doc %{_mandir}/man1/sadf*
|
||||
%doc %{_mandir}/man1/sar*
|
||||
%doc %{_mandir}/man8/*
|
||||
%dir %{_sysconfdir}/sysstat
|
||||
%{_sysconfdir}/sysstat/sysstat
|
||||
%{_bindir}/*
|
||||
%{_sbindir}/*
|
||||
%{_bindir}/iostat
|
||||
%{_bindir}/mpstat
|
||||
%{_bindir}/sadf
|
||||
%{_bindir}/sar
|
||||
%{_sbindir}/rcsysstat
|
||||
%{_datadir}/locale/*/LC_MESSAGES/sysstat.mo
|
||||
/usr/lib/sa
|
||||
%{_libdir}/sa
|
||||
/var/log/sa
|
||||
|
||||
%files isag
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/isag
|
||||
%doc %{_mandir}/man1/isag*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 17 2007 - prusnak@suse.cz
|
||||
- splitted isag utility to separate subpackage sysstat-isag
|
||||
* users will not be forced to install gnuplot (and X stuff) if
|
||||
they do not want to
|
||||
* Tue Apr 17 2007 - prusnak@suse.cz
|
||||
- update to 7.1.3
|
||||
* fixed bug in hotplug cpu support
|
||||
* better support for keeping sar logfiles for more than one month
|
||||
* code cleaned
|
||||
* Tue Mar 13 2007 - prusnak@suse.cz
|
||||
- update to 7.1.2
|
||||
* autoconf support
|
||||
|
Loading…
x
Reference in New Issue
Block a user