From 8f594bdc8cbde3cc355da17075e02f53f173bddf Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Jan 15 2015 13:53:00 +0000 Subject: cleaned .spec file --- diff --git a/sysstat.spec b/sysstat.spec index ec33cae..6a8f8b6 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,47 +1,44 @@ Summary: Collection of performance monitoring tools for Linux Name: sysstat Version: 11.1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://sebastien.godard.pagesperso-orange.fr/ Source: http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz -Requires: fileutils, grep, sh-utils, textutils -Requires(post): systemd, systemd-sysv +BuildRequires: gettext, lm_sensors-devel, systemd + +Requires: findutils +Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: %{_includedir}/linux/if.h, gettext, lm_sensors-devel, perl -BuildRequires: systemd-units - %description -The sysstat package contains sar, sadf, mpstat, iostat, pidstat, nfsiostat, -cifsiostat and sa tools for Linux. -The sar command collects and reports system activity information. This -information can be saved in a file in a binary format for future inspection. The -statistics reported by sar concern I/O transfer rates, paging activity, -process-related activities, interrupts, network activity, memory and swap space -utilization, CPU utilization, kernel activities and TTY statistics, among -others. Both UP and SMP machines are fully supported. -The sadf command may be used to display data collected by sar in various formats -(CSV, XML, etc.). +The sysstat package contains the sar, sadf, mpstat, iostat, pidstat, +nfsiostat-sysstat, cifsiostat and sa tools for Linux. +The sar command collects and reports system activity information. +The information collected by sar can be saved in a file in a binary +format for future inspection. The statistics reported by sar concern +I/O transfer rates, paging activity, process-related activities, +interrupts, network activity, memory and swap space utilization, CPU +utilization, kernel activities and TTY statistics, among others. Both +UP and SMP machines are fully supported. +The sadf command may be used to display data collected by sar in +various formats (CSV, XML, etc.). The iostat command reports CPU utilization and I/O statistics for disks. The mpstat command reports global and per-processor statistics. The pidstat command reports statistics for Linux tasks (processes). -The nfsiostat command reports I/O statistics for network file systems. -The cifsiostat command reports I/O statistics for CIFS file systems. +The nfsiostat-sysstat command reports I/O statistics for network filesystems. +The cifsiostat command reports I/O statistics for CIFS filesystems. %prep %setup -q -iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux -mv CREDITS.aux CREDITS %build -%configure sa_lib_dir=%{_libdir}/sa history=28 compressafter=31 \ - --docdir=%{_pkgdocdir} --disable-man-group --disable-stripping +%configure --docdir=%{_pkgdocdir} --disable-man-group --disable-stripping \ + history=28 compressafter=31 %{__sed} -i 's/SADC_OPTIONS=""/SADC_OPTIONS="-S DISK"/' sysstat.sysconfig -export CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\"" make %{?_smp_mflags} %install @@ -62,36 +59,27 @@ install -m 0644 cron/sysstat-{collect,summary}.{service,timer} %{buildroot}%{_un %preun %systemd_preun sysstat.service sysstat-collect.timer sysstat-summary.timer if [[ $1 -eq 0 ]]; then - # Remove sa logs if removing sysstat completely - rm -f %{_localstatedir}/log/sa/* + # Remove sa logs if removing sysstat completely + rm -rf %{_localstatedir}/log/sa/* fi %postun %systemd_postun sysstat.service sysstat-collect.timer sysstat-summary.timer -%triggerun -- sysstat < 10.0.2-1 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply sysstat -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save sysstat >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del sysstat >/dev/null 2>&1 || : -/bin/systemctl try-restart sysstat.service >/dev/null 2>&1 || : - %files -f %{name}.lang -%doc CHANGES COPYING CREDITS README FAQ +%doc CHANGES COPYING CREDITS FAQ README %config(noreplace) %{_sysconfdir}/sysconfig/sysstat %config(noreplace) %{_sysconfdir}/sysconfig/sysstat.ioconf -%{_unitdir}/sysstat* %{_bindir}/* %{_libdir}/sa -%{_mandir}/man1/* -%{_mandir}/man5/* -%{_mandir}/man8/* +%{_unitdir}/sysstat* +%{_mandir}/man*/* %{_localstatedir}/log/sa %changelog +* Thu Jan 15 2015 Peter Schiffer - 11.1.2-2 +- cleaned .spec file + * Mon Oct 20 2014 Peter Schiffer - 11.1.2-1 - resolves: #1154601 updated to 11.1.2 @@ -412,188 +400,3 @@ fi * Fri Mar 4 2005 Ivana Varekova 5.0.5-7.fc - rebuilt -* Thu Sep 30 2004 Charles Bennett 5.0.5-5.fc -- bring in filename and append-msg patch -- append-msg adds verbose text for when saNN data file cpu count -- does not match cpu count on the currently running system - -* Wed Jun 30 2004 Nils Philippsen -- version 5.0.5 -- remove some obsolete patches -- update statreset, overrun, lib64init patches -- renumber patches - -* Wed Jun 16 2004 Alan Cox -- Fix spew of crap to console at startup -- Fix order of startup (#124035) -- Fix array overrun (#117182) -- Fix interrupt buffer sizing (caused bogus irq info) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Wed Mar 24 2004 Justin Forbes <64bit_fedora@comcast.net> 5.0.1-2 -- fix lib64 init - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 18 2004 Nils Philippsen 5.0.1-1 -- version 5.0.1 -- update statreset patch - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Thu Jan 22 2004 Nils Philippsen 5.0.0-0.6 -- let user configure how long to keep logs through /etc/sysconfig/sysstat - (#81294) -- reset stats at system boot (#102445) - -* Wed Jan 21 2004 Nils Philippsen 5.0.0-0.5 -- fix ifnamsiz patch for s390x (hopefully) - -* Tue Jan 20 2004 Nils Philippsen 5.0.0-0.4 -- fix insecure tmp files in scripts (#78212) -- require tools needed in scripts -- use IFNAMSIZ from {_includedir}/linux/if.h for maximum interface length - -* Mon Jan 12 2004 Nils Philippsen 5.0.0-0.3 -- Buildrequires: perl -- check for %%_lib == lib64 instead of specific arches - -* Mon Jan 12 2004 Nils Philippsen 5.0.0-0.2 -- fix dealing with lib64 case of cron.d file - -* Mon Jan 12 2004 Nils Philippsen 5.0.0-0.1 -- version 5.0.0 - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon Mar 3 2003 Joe Orton 4.0.7-4 -- really fix paths for multilib (#82913) - -* Wed Feb 19 2003 Bill Nottingham 4.0.7-3 -- fix paths on multilib arches (#82913) - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Sat Nov 23 2002 Mike A. Harris 4.0.7-1 -- Updated to new upstream version 4.0.7 - -* Tue Nov 19 2002 Mike A. Harris 4.0.5-7 -- Fixed files installed in /usr/doc to be put in correct place - -* Tue Oct 8 2002 Mike A. Harris 4.0.5-6 -- All-arch rebuild - -* Tue Jul 23 2002 Trond Eivind Glomsrød 4.0.5-3 -- Rebuild - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Mon Jun 17 2002 Trond Eivind Glomsrød 4.0.5-1 -- 4.0.5-1 -- isag is no longer installed by default upstream, removing - requirement on gnuplot - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Mon Apr 22 2002 Trond Eivind Glomsrød 4.0.4-1 -- 4.0.4 -- Add an explicit requires on gnuplot (#63474) - -* Fri Apr 12 2002 Trond Eivind Glomsrød 4.0.3-2 -- Do the daily sa2 run just before midnight, not at 4AM... you'd - only get 4 hours worth of data that way (#63132) - -* Thu Feb 28 2002 Trond Eivind Glomsrød 4.0.3-1 -- 4.0.3 - -* Wed Feb 27 2002 Trond Eivind Glomsrød 4.0.2-3 -- Rebuild - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Wed Dec 12 2001 Trond Eivind Glomsrød 4.0.2-1 -- 4.0.2 -- the kernel patch for extended statistics is in, don't say it needs - applying in the man page - -* Mon Aug 13 2001 Preston Brown -- be more verbose about which files are corrupt (#47122) - -* Mon Jul 2 2001 Preston Brown -- run sa1 from cron.d to fix run-parts interaction problem (#37733) - -* Fri Jun 29 2001 Preston Brown -- upgrade to 4.0.1 stable release - -* Sun Jun 24 2001 Elliot Lee -- Bump release + rebuild. - -* Sun Apr 8 2001 Preston Brown -- explicitly set safe umask (#35142) - -* Fri Mar 9 2001 Preston Brown -- iostat disk utilization was off by a factor of 10. - -* Wed Feb 14 2001 Preston Brown -- 3.3.5 brings us full support for kernel IO stats - -* Tue Jan 30 2001 Preston Brown -- Summarize previous day's activity with sa2, not current day (which is only 4 hours of data when it gets run) (#24820) -- upgrade to 3.3.4 for full 2.4 compatibility and improved iostat - -* Wed Jan 17 2001 Preston Brown -- iostat man page fixes - -* Fri Jan 05 2001 Preston Brown -- 3.3.3, crontab fixes - -* Fri Dec 29 2000 Bill Nottingham -- fix prereqs - -* Fri Oct 13 2000 Preston Brown -- crontab entry was still incorrect. Fixed. - -* Mon Oct 09 2000 Preston Brown -- make sure disk accounting is enabled to fix iostat -l, -p (#16268) -- crontab entries were missing the user (root) to run as (#18212) - -* Tue Aug 22 2000 Preston Brown -- enable IO accounting now that kernel supports it - -* Wed Aug 16 2000 Nalin Dahyabhai -- fix buildrooting (#16271) - -* Tue Aug 08 2000 Preston Brown -- bugfixes in 3.2.4 cause our inclusion. :) - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Thu Jun 29 2000 Preston Brown -- 3.2.3 fixes SMP race condition - -* Tue Jun 20 2000 Preston Brown -- FHS macros -- 3.2.2 - -* Fri May 26 2000 Preston Brown -- packaged for Winston -- change va patch to indicate kernel is not patched for iostat accounting. - re-enable if our stock kernel gets this patch. -- upgrade to 3.2. -- install crontab entry. - -* Sun Dec 12 1999 Ian Macdonald -- upgraded to 2.2 - -* Fri Oct 29 1999 Ian Macdonald -- first RPM release (2.1)