Compare commits

..

2 Commits

Author SHA1 Message Date
Bill Nottingham 07da6d3aeb Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:53:58 +00:00
Jesse Keating 335dc91d4e Initialize branch F-12 for libstatgrab 2009-09-29 05:23:22 +00:00
7 changed files with 123 additions and 321 deletions

1
.cvsignore Normal file
View File

@ -0,0 +1 @@
libstatgrab-0.16.tar.gz

5
.gitignore vendored
View File

@ -1,5 +0,0 @@
/libstatgrab-0.90.tar.gz
/libstatgrab-0.17.tar.gz
/libstatgrab-0.91.tar.gz
/libstatgrab-0.92.tar.gz
/libstatgrab-0.92.1.tar.gz

21
Makefile Normal file
View File

@ -0,0 +1,21 @@
# Makefile for source rpm: libstatgrab
# $Id$
NAME := libstatgrab
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

1
branch Normal file
View File

@ -0,0 +1 @@
F-12

View File

@ -1,12 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libstatgrab
Description: A library that provides a useful interface to system statistics
Version: @VERSION@
Requires.private: log4cplus
Libs: -L${libdir} -lstatgrab
Libs.private: @LINKFLAGS@
Cflags: -I${includedir}

View File

@ -1,180 +1,129 @@
%bcond_without log4cplus
%bcond_without examples
%define shortname statgrab
Name: libstatgrab
Epoch: 1
Version: 0.92.1
Release: 8%{?dist}
Summary: A library that provides cross platform access to statistics of the system
License: LGPL-2.1-or-later
URL: http://www.i-scream.org/libstatgrab
Source0: http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
# REJECTED due to Solaris or whatever linking issue,
# thus we cope with pkgconfig manually.
# See: https://github.com/i-scream/libstatgrab/pull/70
Source1: libstatgrab.pc.in
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%if %{with log4cplus}
BuildRequires: log4cplus-devel
%endif
BuildRequires: ncurses-devel
# Tests.
BuildRequires: perl-generators
BuildRequires: perl(App::Prove)
BuildRequires: perl(Config)
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(File::Spec)
BuildRequires: perl(File::Temp)
BuildRequires: perl(File::Basename)
BuildRequires: perl(FindBin)
BuildRequires: perl(Getopt::Long)
BuildRequires: perl(IPC::Cmd)
BuildRequires: perl(lib)
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(strict)
BuildRequires: perl(Test::More)
BuildRequires: perl(vars)
BuildRequires: perl(warnings)
BuildRequires: make
Summary: Make system statistics
Name: libstatgrab
Version: 0.16
Release: 3%{?dist}
Source0: http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}.nochmod.patch
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.i-scream.org/%{name}/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool ncurses-devel
%description
Libstatgrab is a library that provides cross platform access to statistics
about the system on which it's running. It's written in C and presents a
selection of useful interfaces which can be used to access key system
statistics. The current list of statistics includes CPU usage, memory
utilisation, disk usage, process counts, network traffic, disk I/O, and more.
about the system on which it's run. It's written in C and presents a selection
of useful interfaces which can be used to access key system statistics. The
current list of statistics includes CPU usage, memory utilisation, disk usage,
process counts, network traffic, disk I/O, and more.
The current list of supported and tested platforms includes FreeBSD, Linux,
NetBSD, OpenBSD, Solaris, DragonFly BSD, HP-UX and AIX.
The current list of platforms is Solaris 2.x, Linux, and FreeBSD 4.x/5.x.
The aim is to extend this to include as many operating systems as possible.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
The package also includes a couple of useful tools. The first, saidar,
provides a curses-based interface to viewing the current state of the
system. The second, statgrab, gives a sysctl-style interface to the
statistics gathered by libstatgrab. This extends the use of libstatgrab
to people writing scripts or anything else that can't easily make C
function calls. Included with statgrab is a script to generate an MRTG
configuration file to use statgrab.
%description devel
This package contains libraries, header files and manpages for
developing applications that use libstatgrab.
%package -n %{shortname}-tools
Summary: Tools from %{name} to monitoring the system
License: GPLv2+
Group: Applications/System
%if %{with examples}
%package examples
Summary: The example files from %{name}
License: GPL-2.0-or-later
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
%description -n %{shortname}-tools
This package contains a few tools shiped with libstatgrab.
Eg. A tool called saidar, which shows various system
information like top, but - of course - OTHER informations.
%description examples
%package devel
Summary: The development files from %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
This package contains header files and man pages for those
use to develop libstatgrab based applications.
%package examples
Summary: The example files from %{name}
License: GPLv2+
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
%description examples
This package contains various examples used to show how
to develop libstatgrab based applications.
%endif
%package -n saidar
Summary: System information real-time monitor
License: GPL-2.0-or-later
%description -n saidar
Saidar is a curses-based interface to viewing the current state of the
system.
%package -n statgrab
Summary: Sysctl-style interface to the statistics from libstatgrab
License: GPL-2.0-or-later
%description -n statgrab
Statgrab gives a sysctl-style interface to the statistics gathered by
libstatgrab. This extends the use of libstatgrab to people writing scripts or
anything else that can't easily make C function calls. Included with statgrab
is a script to generate an MRTG configuration file to use statgrab.
# TODO: F23+2 must drop -tools-compat?
%package tools-compat
Summary: Transition package for statgrab-tools
Obsoletes: statgrab-tools < 1:0.91-0
Requires: statgrab%{?_isa} = %{epoch}:%{version}-%{release}
Requires: saidar%{?_isa} = %{epoch}:%{version}-%{release}
%description tools-compat
This package only exists to help transition statgrab-tools users to the new
package split. It will be removed after 2 distribution release cycles, please
do not reference it or depend on it in any way.
%prep
%setup -q
# Instead of wasting several lines to install these programs, makefile hack
# will save the time.
sed -i 's|noinst_PROGRAMS|bin_PROGRAMS|g' examples/Makefile*
# Place log files underneath /var/log.
sed -i 's|@localstatedir@|@localstatedir@/log|g;s|.log4cplus|.log|g' *.properties.in
%patch0 -p0
%build
cp -pf %{S:1} .
autoreconf -fiv
# Changing to asciidoc --enable-man-build
%configure --with-ncurses \
%if %{with log4cplus}
--with-log4cplus \
%endif
%if %{with examples}
--enable-examples \
%endif
--disable-static
%configure --with-ncurses
%make_build
# remove rpath from libtool
# shamelessly stolen from cinepaint.spec (thanks!)
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
%make_install
%if %{with examples}
%make_install -C examples/
%endif
# Use %%doc instead.
rm -frv %{buildroot}%{_docdir}
# Drop libtool archive.
find %{buildroot} -name '*.la' -delete -print
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
cd examples/.libs
install -m 755 cpu_usage disk_traffic load_stats network_iface_stats \
network_traffic os_info page_stats process_snapshot \
process_stats user_list vm_stats $RPM_BUILD_ROOT%{_bindir}
chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab-make-mrtg-config
chmod 755 $RPM_BUILD_ROOT%{_bindir}/saidar
chmod 755 $RPM_BUILD_ROOT%{_bindir}/statgrab
mkdir -p %{buildroot}%{_docdir}/%{name}-tools-compat/
cat <<'EOF' >> %{buildroot}%{_docdir}/%{name}-tools-compat/README.Fedora
This package only exists to help transition statgrab-tools users to the new
package split. the structure of the transition is:
%clean
rm -rf $RPM_BUILD_ROOT
└── statgrab-tools --> └── %{name}-tools-compat
├── saidar
└── statgrab
%post -p /sbin/ldconfig
In the past prior to Fedora 24, libstatgrab had only 1 package for 2 programs
with different usage, while putting them inside one package seems reasonable,
however in order to reduce the size of the package, we decided to halve the
original package, now users can choose which to install, saidar or statgrab.
%postun -p /sbin/ldconfig
Note this compat package will be removed after 2 distribution release cycles,
please do not reference it or depend on it in any way.
Yours,
libstatgrab maintainers
EOF
%check
make check
%ldconfig_scriptlets
%files -n %shortname-tools
%defattr(-,root,root)
%doc COPYING
%{_bindir}/saidar
%{_bindir}/statgrab
%{_bindir}/statgrab-make-mrtg-config
%{_bindir}/statgrab-make-mrtg-index
%{_mandir}/*/statgrab*
%{_mandir}/*/saidar*
%files
%license COPYING.LGPL
%defattr(-,root,root)
%doc AUTHORS INSTALL README ChangeLog NEWS COPYING.LGPL examples/*.c
%{_libdir}/*.so.*
%files devel
%doc AUTHORS NEWS PLATFORMS README
%doc examples/*.c
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/*.a
%{_libdir}/*.la
%{_includedir}/*.h
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/pkgconfig/%name.pc
%{_mandir}/*/sg_*
%if %{with examples}
%files examples
%license COPYING
%defattr(-,root,root)
%{_bindir}/cpu_usage
%{_bindir}/disk_traffic
%{_bindir}/filesys_snapshot
%{_bindir}/load_stats
%{_bindir}/network_iface_stats
%{_bindir}/network_traffic
@ -183,162 +132,9 @@ make check
%{_bindir}/process_snapshot
%{_bindir}/process_stats
%{_bindir}/user_list
%{_bindir}/valid_filesystems
%{_bindir}/vm_stats
%endif
%files tools-compat
%{_docdir}/%{name}-tools-compat/README.Fedora
%files -n saidar
%license COPYING
%{_bindir}/saidar
%if %{with log4cplus}
%config(noreplace) %{_sysconfdir}/saidar.properties
%endif
%{_mandir}/*/saidar*
%files -n statgrab
%license COPYING
%{_bindir}/statgrab*
%if %{with log4cplus}
%config(noreplace) %{_sysconfdir}/statgrab.properties
%endif
%{_mandir}/*/*statgrab*
%changelog
* Thu Aug 10 2023 Martin Osvald <mosvald@redhat.com> - 1:0.92.1-8
- Rebuilt for log4cplus 2.1.0
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 27 2023 Tim Orling <ticotimo@gmail.com> - 1:0.92.1-5
- migrated to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 29 2021 Tim Orling <ticotimo@gmail.com> - 1:0.92.1-1
- Update to 0.92.1 (Fix rhbz 1943112)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Nov 29 18:49:18 JST 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:0.92-6
- Rebuild for new log4cplus
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92-5
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Apr 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.92-3
- Add perl(lib) for tests
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.92-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Aug 18 2019 Tim Orling <ticotimo@gmail.com> - 1:0.92-1
- Update to 0.92 (rhbz 1742062)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Feb 16 2017 Ralf Corsépius <corsepiu@fedoraproject.org> - 1:0.91-6
- Add BR: perl(App::Prove) (Fix F26FTBFS).
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Apr 18 2016 Tomas Hozza <thozza@redhat.com> - 1:0.91-4
- Rebuild against log4cplus 1.2.0
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.91-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Sep 19 2015 Christopher Meng <rpm@cicku.me> - 1:0.91-2
- Fix upgrade path of statgrab-tools
* Sun Jul 26 2015 Christopher Meng <rpm@cicku.me> - 1:0.91-1
- Update to 0.91
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.17-8.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.17-7.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.17-6.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Sep 17 2013 Oliver Falk <oliver@linux-kernel.at> - 1:0.17-5.2
- Fix requires (epoch)
* Tue Sep 17 2013 Oliver Falk <oliver@linux-kernel.at> - 1:0.17-5.1
- Fix BZ#1008491 - too many broken deps
* Fri Aug 16 2013 Christopher Meng <rpm@cicku.me> - 0.90-2
- SPEC Cleanup.
- Remove unneeded Requires.
* Tue Aug 13 2013 Oliver Falk <oliver@linux-kernel.at> - 0.90-1
- Update
- Should fix BZ#925891
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.17-5
- Perl 5.18 rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sun Apr 10 2011 Sven Lankes <sven@lank.es> - 0.17-1
- new upstream release
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Jan 27 2011 Oliver Falk <oliver@linux-kernel.at> 0.16-5
- Rebuild for new perl-5.12.3
* Fri Feb 12 2010 Oliver Falk <oliver@linux-kernel.at> 0.16-4
- Disable building of static libs #556075
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@ -367,32 +163,32 @@ make check
* Tue Sep 19 2006 Patrick "Jima" Laughton <jima@beer.tclug.org> - 0.13-2
- Bump for FC6 rebuild
* Thu Apr 20 2006 Oliver Falk <oliver@linux-kernel.at> - 0.13-1
* Thu Apr 20 2006 Oliver Falk <oliver@linux-kernel.at> - 0.13-1
- Update
* Wed Aug 10 2005 Oliver Falk <oliver@linux-kernel.at> - 0.12-1
* Wed Aug 10 2005 Oliver Falk <oliver@linux-kernel.at> - 0.12-1
- Update
- Added saidar manpage
* Fri Jul 08 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-3
* Fri Jul 08 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-3
- Included examples/*.c in doc
* Wed Jul 6 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.11.1-2
- a lot of fixes for Fedora Extras
* Thu May 19 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1.1
* Thu May 19 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1.1
- Specfile cleanup
* Sun Apr 03 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1
* Sun Apr 03 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11.1-1
- Update
* Fri Mar 25 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2.1
* Fri Mar 25 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2.1
- Fix rpmlint warnings
* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2
* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-2
- Don't require coreutils. They are normally installed on Fedora, but
not available on RH 8, where the tools are usually also installed.
Yes, rebuilding with nodeps would also do it, but it's not fine...
* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-1
* Tue Feb 15 2005 Oliver Falk <oliver@linux-kernel.at> - 0.11-1
- Initial build for Fedora Core

View File

@ -1 +1 @@
SHA512 (libstatgrab-0.92.1.tar.gz) = e1f14df8abbb044d02b0ecebc23fbe9effaa0bac6738686e661de015564df5a4d872edef6d07fd150db25764b449d47ef54beecbe12c51987a679b07edc53c97
77582438274679a9641d043ddcccdd4e libstatgrab-0.16.tar.gz