summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2016-04-14 17:31:14 -0700
committerTim Orling <TicoTimo@gmail.com>2016-04-14 17:31:14 -0700
commit077ee73993405cfeba8ace63fd586ea86033a224 (patch)
tree0a3160b025df03b9701703d711f7d0134d0bde03
parent5856486d1c4875741edae582b96c3a369546c6aa (diff)
downloadperl-Unix-Statgrab-077ee73993405cfeba8ace63fd586ea86033a224.tar.gz
perl-Unix-Statgrab-077ee73993405cfeba8ace63fd586ea86033a224.tar.xz
perl-Unix-Statgrab-077ee73993405cfeba8ace63fd586ea86033a224.zip
Bring up to date with Fedora pkgHEADmaster
-rw-r--r--.gitignore1
-rw-r--r--Unix-Statgrab-0.04-fixedtest.patch26
-rw-r--r--Unix-Statgrab-0.109-Disable-get_user_stats-tests.patch32
-rw-r--r--perl-Unix-Statgrab.spec77
-rw-r--r--sources2
5 files changed, 84 insertions, 54 deletions
diff --git a/.gitignore b/.gitignore
index 32eef46..fd472b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Unix-Statgrab-0.04.tar.gz
+/Unix-Statgrab-0.109.tar.gz
diff --git a/Unix-Statgrab-0.04-fixedtest.patch b/Unix-Statgrab-0.04-fixedtest.patch
deleted file mode 100644
index 6a5044a..0000000
--- a/Unix-Statgrab-0.04-fixedtest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up Unix-Statgrab-0.04/t/Unix-Statgrab.t.fixedtest Unix-Statgrab-0.04/t/Unix-Statgrab.t
---- Unix-Statgrab-0.04/t/Unix-Statgrab.t.fixedtest 2012-08-06 14:42:51.831022299 +0200
-+++ Unix-Statgrab-0.04/t/Unix-Statgrab.t 2012-08-06 14:43:02.067962581 +0200
-@@ -1,5 +1,5 @@
- use Test;
--BEGIN { plan tests => 22 };
-+BEGIN { plan tests => 21 };
-
- use Unix::Statgrab;
- ok(1); # If we made it this far, we're ok.
-@@ -101,15 +101,3 @@ if ($pr) {
- $pr->state;
- }
- ok(1);
--
--
--@p = sort sort_procs_by_name $p->all_procs;
--@p = sort sort_procs_by_pid $p->all_procs;
--@p = sort sort_procs_by_uid $p->all_procs;
--@p = sort sort_procs_by_gid $p->all_procs;
--@p = sort sort_procs_by_size $p->all_procs;
--@p = sort sort_procs_by_res $p->all_procs;
--@p = sort sort_procs_by_cpu $p->all_procs;
--@p = sort sort_procs_by_time $p->all_procs;
--ok(1);
--
diff --git a/Unix-Statgrab-0.109-Disable-get_user_stats-tests.patch b/Unix-Statgrab-0.109-Disable-get_user_stats-tests.patch
new file mode 100644
index 0000000..a5c9331
--- /dev/null
+++ b/Unix-Statgrab-0.109-Disable-get_user_stats-tests.patch
@@ -0,0 +1,32 @@
+diff --git a/t/01-methods.t b/t/01-methods.t
+index af1a48a..773f6e3 100644
+--- a/t/01-methods.t
++++ b/t/01-methods.t
+@@ -77,7 +77,6 @@ my %funcs = (
+ voluntary_context_switches involuntary_context_switches proc_size
+ proc_resident start_time time_spent cpu_percent nice state systime/
+ ],
+- get_user_stats => [qw/login_name record_id device hostname pid login_time systime/],
+ );
+
+ my %errs = ( get_error => [qw/error error_name error_value error_arg strperror/], );
+@@ -111,6 +110,7 @@ foreach my $func ( sort @{$Unix::Statgrab::EXPORT_TAGS{stats}} )
+ {
+ SKIP:
+ {
++ skip("get_user_stats is broken :(") if $func eq "get_user_stats";
+ my $sub = Unix::Statgrab->can($func);
+ ok( $sub, "Unix::Statgrab->can('$func')" ) or skip("Can't invoke unknow stats-call $func");
+ my $o = &{$sub}();
+diff --git a/t/03-leak.t b/t/03-leak.t
+index 84b46f4..75b3d55 100644
+--- a/t/03-leak.t
++++ b/t/03-leak.t
+@@ -23,7 +23,6 @@ my %funcs = (
+ get_network_iface_stats => [],
+ get_page_stats => [qw/get_page_stats_diff/],
+ get_process_stats => [],
+- get_user_stats => [],
+ );
+
+ my %errs = (
diff --git a/perl-Unix-Statgrab.spec b/perl-Unix-Statgrab.spec
index 5cbbf85..efb5726 100644
--- a/perl-Unix-Statgrab.spec
+++ b/perl-Unix-Statgrab.spec
@@ -1,18 +1,44 @@
Name: perl-Unix-Statgrab
-Version: 0.04
-Release: 25.1%{?dist}
+Version: 0.109
+Release: 2%{?dist}
Summary: Perl extension for collecting information about the machine
License: LGPLv2+
-Group: Development/Libraries
URL: http://search.cpan.org/dist/Unix-Statgrab/
-Source0: http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Unix-Statgrab-%{version}.tar.gz
-Patch0: Unix-Statgrab-0.04-fixedtest.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libstatgrab-devel >= 0.12
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(Test::Pod)
-BuildRequires: perl(Test::Pod::Coverage)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Source0: http://www.cpan.org/authors/id/R/RE/REHSACK/Unix-Statgrab-%{version}.tar.gz
+# rt#107241
+Patch0: Unix-Statgrab-0.109-Disable-get_user_stats-tests.patch
+# Build
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: perl
+BuildRequires: perl(Capture::Tiny)
+BuildRequires: perl(Config)
+BuildRequires: perl(Config::AutoConf)
+BuildRequires: perl(ExtUtils::CBuilder)
+BuildRequires: perl(ExtUtils::Constant)
+BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires: perl(File::Basename)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(lib)
+BuildRequires: perl(parent)
+BuildRequires: perl(strict)
+BuildRequires: perl(Text::ParseWords)
+BuildRequires: perl(warnings)
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(libstatgrab) >= 0.90
+# Runtime
+BuildRequires: perl(AutoLoader)
+BuildRequires: perl(Carp)
+BuildRequires: perl(DynaLoader)
+BuildRequires: perl(Exporter)
+BuildRequires: perl(vars)
+# Tests only
+BuildRequires: perl(Test::More)
+# Optional tests only
+BuildRequires: perl(Test::LeakTrace)
+Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
%description
Unix::Statgrab is a wrapper for libstatgrab as available from
@@ -22,37 +48,34 @@ operating system, CPU, memory usage, network interfaces, hard-disks etc.
%prep
%setup -q -n Unix-Statgrab-%{version}
-%patch0 -p1 -b .fixedtest
+%patch0 -p1
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
-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' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
+%{_fixperms} %{buildroot}/*
%check
make test
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README.md
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Unix*
%{_mandir}/man3/*
%changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.109-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Sep 22 2015 Petr Ĺ abata <contyk@redhat.com> - 0.109-1
+- 0.109 bump
+- Disabling user_data tests as they seem to be broken at the moment (rt#107241)
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.04-25.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index 08c32ed..4438f9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94787010e27183ce5cf354c58c465d0d Unix-Statgrab-0.04.tar.gz
+e1a084a220d7c7cb46cb1e06957fab3f Unix-Statgrab-0.109.tar.gz