From 56322c8e2f9227a50e10eeba687f3f9166317b99 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 26 Sep 2006 22:06:43 +0000 Subject: Update to 0.04. Drop compile fix patch. Fix find option order. --- .cvsignore | 2 +- Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch | 43 ----------------------- needs.rebuild | 1 - perl-Unix-Statgrab.spec | 15 ++++---- sources | 2 +- 5 files changed, 10 insertions(+), 53 deletions(-) delete mode 100644 Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch delete mode 100644 needs.rebuild diff --git a/.cvsignore b/.cvsignore index 5f9bb99..32eef46 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Unix-Statgrab-0.03.tar.gz +Unix-Statgrab-0.04.tar.gz diff --git a/Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch b/Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch deleted file mode 100644 index 27787a3..0000000 --- a/Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -uNr Unix-Statgrab-0.03/lib/Unix/Statgrab.pm Unix-Statgrab-0.03.of/lib/Unix/Statgrab.pm ---- Unix-Statgrab-0.03/lib/Unix/Statgrab.pm 2005-04-03 07:45:44.000000000 +0200 -+++ Unix-Statgrab-0.03.of/lib/Unix/Statgrab.pm 2005-08-10 11:15:20.000000000 +0200 -@@ -479,7 +479,7 @@ - - The speed of the interface, in megabits/sec - --=item * B -+=item * B - - One of C, C and C. Unknown could mean that duplex hasn't been negotiated yet. - -diff -uNr Unix-Statgrab-0.03/Statgrab.xs Unix-Statgrab-0.03.of/Statgrab.xs ---- Unix-Statgrab-0.03/Statgrab.xs 2005-04-03 07:32:41.000000000 +0200 -+++ Unix-Statgrab-0.03.of/Statgrab.xs 2005-08-10 11:12:40.000000000 +0200 -@@ -1113,13 +1113,13 @@ - RETVAL - - IV --dup (self, num = 0) -+duplex (self, num = 0) - sg_network_iface_stats_my *self; - int num; - CODE: - if (num < 0 || num >= self->nifs) - XSRETURN_UNDEF; -- RETVAL = IF(num)->dup; -+ RETVAL = IF(num)->duplex; - OUTPUT: - RETVAL - -diff -uNr Unix-Statgrab-0.03/t/Unix-Statgrab.t Unix-Statgrab-0.03.of/t/Unix-Statgrab.t ---- Unix-Statgrab-0.03/t/Unix-Statgrab.t 2005-04-03 07:35:08.000000000 +0200 -+++ Unix-Statgrab-0.03.of/t/Unix-Statgrab.t 2005-08-10 11:15:28.000000000 +0200 -@@ -50,7 +50,7 @@ - ierrors oerrors collisions systime/ ], - get_network_io_stats_diff => [ qw/num_ifaces interface_name tx rx ipackets opackets - ierrors oerrors collisions systime/ ], -- get_network_iface_stats => [ qw/num_ifaces interface_name speed dup up/ ], -+ get_network_iface_stats => [ qw/num_ifaces interface_name speed duplex up/ ], - get_page_stats => [ qw/pages_pagein pages_pageout systime/ ], - get_page_stats_diff => [ qw/pages_pagein pages_pageout systime/ ], - get_user_stats => [ qw/num_entries name_list/ ], diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/perl-Unix-Statgrab.spec b/perl-Unix-Statgrab.spec index 1c52fcd..e0a6015 100644 --- a/perl-Unix-Statgrab.spec +++ b/perl-Unix-Statgrab.spec @@ -1,8 +1,8 @@ Name: perl-Unix-Statgrab Summary: Perl extension for collecting information about the machine -Version: 0.03 -Release: 7%{?dist} +Version: 0.04 +Release: 1%{?dist} Group: Development/Libraries License: LGPL @@ -11,8 +11,6 @@ Source0: http://search.cpan.org/CPAN/authors/id/V/VP/VPARSEVAL/Unix-Statgrab-%{ Source1: http://www.fsf.org/licensing/licenses/lgpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: Unix-Statgrab-0.03-compile_libstatgrab-0.12.patch - BuildRequires: libstatgrab-devel >= 0.12 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) @@ -27,8 +25,6 @@ operating system, CPU, memory usage, network interfaces, hard-disks etc. %prep %setup -q -n Unix-Statgrab-%{version} -%patch0 -p1 - %{__cp} %{SOURCE1} LICENSE.TXT %build @@ -40,7 +36,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* %check @@ -57,6 +53,11 @@ chmod -R u+w $RPM_BUILD_ROOT/* %{_mandir}/man3/*.3* %changelog +* Tue Sep 26 2006 Steven Pritchard 0.04-1 +- Update to 0.04. +- Drop compile fix patch. +- Fix find option order. + * Wed Aug 24 2005 Oliver Falk - 0.03-7 - Try if Ralf's %files section works diff --git a/sources b/sources index f6c7607..08c32ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -089380f21fa7e3d4b7a1bc55d658fd9c Unix-Statgrab-0.03.tar.gz +94787010e27183ce5cf354c58c465d0d Unix-Statgrab-0.04.tar.gz -- cgit