OBS User unknown 2008-08-22 20:22:55 +00:00 committed by Git OBS Bridge
parent 483b62c49e
commit bef6da5ee4
11 changed files with 255 additions and 140 deletions

9
isag.desktop Normal file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Version=1.0
Name=Isag System Activity Grapher
GenericName=System Monitor
Comment=Interactive System Activity Grapher for sysstat
Exec=isag
Icon=utilities-system-monitor
Type=Application
Categories=System;Monitor;

View File

@ -1,89 +0,0 @@
--- nls/af.po
+++ nls/af.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Kan nie data byskryf by die file nie\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "Kan nie data byskryf by die file nie (%s)\n"
#: sadf.c:78
#, c-format
--- nls/de.po
+++ nls/de.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "An diese Datei können keine Daten angehangen werden.\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "An die Datei %s k-Bönnen keine Daten angehangen werden: die Anzahl der Prozessoren ist ge-Aändert\n"
#: sadf.c:78
#, c-format
--- nls/es.po
+++ nls/es.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "No pueden añadirse datos a ese fichero\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "No pueden añadirse datos al fichero %s: el número de procesadores ha cambiado\n"
#: sadf.c:78
#, c-format
--- nls/fr.po
+++ nls/fr.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Impossible d'ajouter des données à la fin de ce fichier\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "Impossible d'ajouter des données à la fin de fichier %s: le nombre de processeurs s'est changé\n"
#: sadf.c:78
#, c-format
--- nls/it.po
+++ nls/it.po
@@ -136,8 +136,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Impossibile aggiungere dati a quel file\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "Impossibile aggiungere dati a quel file (%s)\n"
#: sadf.c:78
#, c-format
--- nls/pt.po
+++ nls/pt.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Não posso adicionar dados neste arquivo\n"
+msgid "Cannot append data to file %s: the number of processors has changed\n"
+msgstr "Não posso adicionar dados neste arquivo (%s)\n"
#: sadf.c:78
#, c-format
--- sadc.c
+++ sadc.c
@@ -565,7 +565,7 @@
create_sa_file(ofd, ofile, file_stats_size, flags);
return;
}
- fprintf(stderr, _("Cannot append data to that file\n"));
+ fprintf(stderr, _("Cannot append data to file %s: the number of processors has changed\n"), ofile);
exit(1);
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac9253686e264489c303d9d16aa9c9dcb8072d1125e1545985f5ed12acbef509
size 181385

182
sysstat-8.1.5-msg.diff Normal file
View File

@ -0,0 +1,182 @@
--- nls/af.po
+++ nls/af.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Kan nie data byskryf by die file nie\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Kan nie data byskryf by die file nie (%s)\n"
#: sadf.c:78
#, c-format
--- nls/da.po
+++ nls/da.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Kan ikke tilføje data til den fil\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Kan ikke tilføje data til den fil (%s)\n"
#: sadf.c:78
#, c-format
--- nls/de.po
+++ nls/de.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "An diese Datei können keine Daten angehangen werden.\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "An die Datei %s k-Bönnen keine Daten angehangen werden."
#: sadf.c:78
#, c-format
--- nls/es.po
+++ nls/es.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "No pueden añadirse datos a ese fichero\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "No pueden añadirse datos al fichero %s.\n"
#: sadf.c:78
#, c-format
--- nls/fr.po
+++ nls/fr.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Impossible d'ajouter des données à la fin de ce fichier\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Impossible d'ajouter des données à la fin de fichier %s.\n"
#: sadf.c:78
#, c-format
--- nls/it.po
+++ nls/it.po
@@ -136,8 +136,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Impossibile aggiungere dati a quel file\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Impossibile aggiungere dati a quel file (%s)\n"
#: sadf.c:78
#, c-format
--- nls/ja.po
+++ nls/ja.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë¥Ç¡¼¥¿¤òÄɲäǤ­¤Þ¤»¤ó\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "¥Õ¥¡¥¤¥ë¤Ë¥Ç¡¼¥¿¤òÄɲäǤ­¤Þ¤»¤ó (%s)\n"
#: sadf.c:78
#, c-format
--- nls/ky.po
+++ nls/ky.po
@@ -136,8 +136,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Берилиштер тиги файлга кошоалынган жок\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Берилиштер тиги файлга кошоалынган жок (%s)\n"
#: sadf.c:78
#, c-format
--- nls/nb.po
+++ nls/nb.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Kan ikke skrive mer data til den filen\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Kan ikke skrive mer data til den filen (%s)\n"
#: sadf.c:78
#, c-format
--- nls/nn.po
+++ nls/nn.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Kan ikkje skriva meir data til den fila\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Kan ikkje skriva meir data til den fila (%s)\n"
#: sadf.c:78
#, c-format
--- nls/pt.po
+++ nls/pt.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Não posso adicionar dados neste arquivo\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Não posso adicionar dados neste arquivo (%s)\n"
#: sadf.c:78
#, c-format
--- nls/ro.po
+++ nls/ro.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Nu se pot adauga date in acel fisier\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Nu se pot adauga date in acel fisier (%s)\n"
#: sadf.c:78
#, c-format
--- nls/ru.po
+++ nls/ru.po
@@ -136,8 +136,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÄÁÎÎÙÅ × ÜÔÏÔ ÆÁÊÌ\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÄÁÎÎÙÅ × ÜÔÏÔ ÆÁÊÌ (%s)\n"
#: sadf.c:78
#, c-format
--- nls/sk.po
+++ nls/sk.po
@@ -135,8 +135,8 @@
#: sadc.c:568
#, c-format
-msgid "Cannot append data to that file\n"
-msgstr "Nie je mo¾né dopísa» údaje do toho súboru\n"
+msgid "Cannot append data to that file (%s)\n"
+msgstr "Nie je mo¾né dopísa» údaje do súboru %s\n"
#: sadf.c:78
#, c-format

View File

@ -1,6 +1,6 @@
--- common.h
+++ common.h
@@ -78,8 +78,8 @@
@@ -125,8 +125,8 @@
* kB <-> number of pages.
* Page size depends on machine architecture (4 kB, 8 kB, 16 kB, 64 kB...)
*/
@ -9,5 +9,5 @@
+#define KB_TO_PG(k) ((k) / (getpagesize()/1024) )
+#define PG_TO_KB(k) ((k) * (getpagesize()/1024) )
/* Memory data read from /proc/meminfo */
struct meminf {
/*
***************************************************************************

View File

@ -1,6 +1,6 @@
--- FAQ
+++ FAQ
@@ -406,9 +406,9 @@
@@ -407,9 +407,9 @@
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 +12,7 @@
configuration file.
~~~
@@ -448,7 +448,7 @@
@@ -449,7 +449,7 @@
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

3
sysstat-8.1.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0284b914243c3938aedc144a6b570a94588816853fc6f2d5bc104747acbf85b
size 201597

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50f505443a1373deb788dfb3460fcf62605d18173b5af6dd8ecb89488a1feeb4
size 1347
oid sha256:fe7ff3a361e365537f127e35b3d5ac044dd1557c7905f62ade9d4c286a8dd11a
size 1433

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 19 11:45:59 CEST 2008 - prusnak@suse.cz
- updated to 8.1.5:
- changes too numerous to list (see CHANGES file)
- fix missing --boot parameter in init script [bnc#378874]
- fixed disc statistics logging [bnc#407004]
-------------------------------------------------------------------
Thu Jun 26 15:58:11 CEST 2008 - werner@suse.de

View File

@ -1,10 +1,17 @@
#
# spec file for package sysstat (Version 8.0.4)
# spec file for package sysstat (Version 8.1.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@ -12,19 +19,18 @@
Name: sysstat
Version: 8.0.4
Release: 34
Version: 8.1.5
Release: 1
PreReq: %insserv_prereq %fillup_prereq
BuildRequires: findutils sed
Requires: procmail
Requires: gettext
AutoReqProv: on
BuildRequires: findutils sed update-desktop-files
Requires: procmail gettext
Group: System/Monitoring
License: GPL v2 or later
Url: http://pagesperso-orange.fr/sebastien.godard/
Summary: Sar and Iostat Commands for Linux
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-SUSE.tar.bz2
Source2: isag.desktop
Patch0: %{name}-%{version}-sa1sa2lock.diff
Patch1: %{name}-%{version}-msg.diff
Patch2: %{name}-%{version}-pagesize.diff
@ -50,7 +56,6 @@ License: GPL v2 or later
Requires: sysstat = %{version}
Requires: gnuplot tk
Group: System/Monitoring
AutoReqProv: on
Summary: Interactive System Activity Grapher for sysstat
%description isag
@ -70,6 +75,10 @@ Authors:
%patch1
%patch2
%patch3
# change /usr/lib to /usr/lib64 or something else when needed
if [ "%{_libdir}" != "/usr/lib" ]; then
sed -i 's:/usr/lib/:%{_libdir}/:g' SUSE/etc/init.d/boot.sysstat SUSE/etc/sysstat/sysstat.cron
fi
%build
export conf_dir=%{_sysconfdir}/sysstat
@ -80,29 +89,25 @@ export LFLAGS="-L. -lsyscom"
--enable-nls \
--disable-smp-race \
--enable-man-group
make
# change /usr/lib to /usr/lib64 when needed
if [ "%{_libdir}" != "/usr/lib" ]; then
find SUSE -type f -exec sed -i 's:/usr/lib:%{_libdir}:' {} \;
fi
make %{?jobs:-j%jobs}
%install
install -d $RPM_BUILD_ROOT/var/log/sa
make DESTDIR="$RPM_BUILD_ROOT" install
cp -a SUSE/* $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_localstatedir}/log/sa
make DESTDIR=$RPM_BUILD_ROOT install
install -D -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/isag.desktop
%suse_update_desktop_file -r isag System Monitor
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*
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
ln -fs /etc/init.d/sysstat $RPM_BUILD_ROOT%{_sbindir}/rcsysstat
%{find_lang} %{name}
cp -a SUSE/* $RPM_BUILD_ROOT
%find_lang %{name}
%preun
%{stop_on_removal sysstat}
[ "$1" -gt 0 ] || rm -f /var/log/sa/*
%{stop_on_removal boot.sysstat}
[ "$1" -gt 0 ] || rm -f %{_localstatedir}/log/sa/*
%post
%{fillup_and_insserv sysstat}
%{fillup_and_insserv boot.sysstat}
%postun
%{insserv_cleanup}
@ -112,33 +117,33 @@ rm -rf "$RPM_BUILD_ROOT"
%files -f %name.lang
%defattr(-,root,root)
%doc CHANGES COPYING CREDITS FAQ README TODO
%doc %{_mandir}/man1/*
%doc %{_mandir}/man8/*
%exclude %{_mandir}/man1/isag*
%dir %{_sysconfdir}/sysstat
%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}/man1/iostat*
%doc %{_mandir}/man1/mpstat*
%doc %{_mandir}/man1/pidstat*
%doc %{_mandir}/man1/sadf*
%doc %{_mandir}/man1/sar*
%doc %{_mandir}/man8/*
%dir %{_sysconfdir}/sysstat
%attr(755,root,root) %{_sysconfdir}/init.d/boot.sysstat
%{_sysconfdir}/sysstat/sysstat
%{_bindir}/iostat
%{_bindir}/mpstat
%{_bindir}/pidstat
%{_bindir}/sadf
%{_bindir}/sar
%{_sbindir}/rcsysstat
%{_bindir}/*
%exclude %{_bindir}/isag
%{_libdir}/sa
/var/log/sa
%{_localstatedir}/log/sa
%files isag
%defattr(-,root,root)
%{_bindir}/isag
%doc contrib/isag/README-isag
%doc %{_mandir}/man1/isag*
%{_bindir}/isag
%{_datadir}/applications/isag*
%changelog
* Tue Aug 19 2008 prusnak@suse.cz
- updated to 8.1.5:
- changes too numerous to list (see CHANGES file)
- fix missing --boot parameter in init script [bnc#378874]
- fixed disc statistics logging [bnc#407004]
* Thu Jun 26 2008 werner@suse.de
- No patch for SuSE stuff
* Thu Jun 19 2008 werner@suse.de