Update to 1.702

9 years ago · a09360852b
parent 1c9406a351
commit a09360852b
4 changed files with 189 additions and 33 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@
 /MCE-1.605.tar.gz
 /MCE-1.606.tar.gz
 /MCE-1.608.tar.gz
+/MCE-1.702.tar.gz
--- a/MCE-1.700-provides.patch
+++ b/MCE-1.700-provides.patch
@ -0,0 +1,108 @@
+--- lib/MCE/Core/Input/Generator.pm
+++ lib/MCE/Core/Input/Generator.pm
+@@ -19,7 +19,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Input/Handle.pm
+++ lib/MCE/Core/Input/Handle.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Input/Iterator.pm
+++ lib/MCE/Core/Input/Iterator.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Input/Request.pm
+++ lib/MCE/Core/Input/Request.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Input/Sequence.pm
+++ lib/MCE/Core/Input/Sequence.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Manager.pm
+++ lib/MCE/Core/Manager.pm
+@@ -20,7 +20,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Validation.pm
+++ lib/MCE/Core/Validation.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Core/Worker.pm
+++ lib/MCE/Core/Worker.pm
+@@ -18,7 +18,8 @@ our $VERSION = '1.700';
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings qw( threads recursion uninitialized );
+ 
+--- lib/MCE/Relay.pm
+++ lib/MCE/Relay.pm
+@@ -150,7 +150,8 @@ sub import {
+ 
+ ## Items below are folded into MCE.
+ 
+-package MCE;
+package # hide from rpm
+   MCE;
+ 
+ no warnings 'threads';
+ no warnings 'recursion';
--- a/perl-MCE.spec
+++ b/perl-MCE.spec
@ -1,20 +1,22 @@
 Name:           perl-MCE
-Version:        1.608
-Release:        4%{?dist}
+Version:        1.702
+Release:        1%{?dist}
 Summary:        Many-core Engine for Perl providing parallel processing capabilities
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MCE/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARIOROY/MCE-%{version}.tar.gz
-# Fix sharp-bang line
 Patch0:         MCE-1.600-Fix-sharp-bang-line.patch
+Patch1:         MCE-1.700-provides.patch
 BuildArch:      noarch
-# Build
+# Module Build
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
-# Runtime
-# The bin/mce_grep is not used by tests
+# Module Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(bytes)
 BuildRequires:  perl(Carp)
@ -22,31 +24,26 @@ BuildRequires:  perl(constant)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Fcntl)
 BuildRequires:  perl(File::Path)
-# Unused BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(IO::Handle)
+BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Socket)
 BuildRequires:  perl(Storable) >= 2.04
 BuildRequires:  perl(Symbol)
+BuildRequires:  perl(threads::shared)
 BuildRequires:  perl(Time::HiRes)
-# Tests only
+# Script Runtime
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(lib)
+BuildRequires:  perl(vars)
+# Test Suite
 BuildRequires:  perl(Test::More)
+# Dependencies
 Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 Requires:       perl(IO::Handle)
-Requires:       perl(MCE::Candy)
-Requires:       perl(MCE::Core::Input::Generator)
-Requires:       perl(MCE::Core::Input::Handle)
-Requires:       perl(MCE::Core::Input::Iterator)
-Requires:       perl(MCE::Core::Input::Request)
-Requires:       perl(MCE::Core::Input::Sequence)
-Requires:       perl(MCE::Core::Manager)
-Requires:       perl(MCE::Core::Validation)
-Requires:       perl(MCE::Core::Worker)
-Requires:       perl(MCE::Util)
-Requires:       perl(Storable) >= 2.04
-
-%{?perl_default_filter}
-%global __requires_exclude %{?__requires_exclude|%__requires_exclude|}^perl\\(Storable\\)$
-%global __provides_exclude %{?__provides_exclude|%__provides_exclude|}^perl\\(MCE\\)$
+Requires:       perl(POSIX)
+Requires:       perl(threads::shared)

 %description
 Many-core Engine (MCE) for Perl helps enable a new level of performance by
@ -65,11 +62,15 @@ Requires:       grep
 This package delivers command line tools like mce_grep(1) that utilize
 the Many-core Engine (MCE) Perl library.

-
 %prep
 %setup -q -n MCE-%{version}
+
+# Fix sharp-bang line
 %patch0 -p1
-chmod -c a-x examples/*pl
+
+# Avoid unversioned provide of perl(MCE)
+%patch1
+

 %build
 MCE_INSTALL_TOOLS=1 perl Makefile.PL INSTALLDIRS=vendor
@ -77,23 +78,69 @@ make %{?_smp_mflags}

 %install
 make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -exec rm -f {} +
-%{_fixperms} %{buildroot}/*
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} %{buildroot}

 %check
 make test

 %files
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc CHANGES CREDITS README examples
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%if 0%{?_licensedir:1}
+%license LICENSE Copying
+%else
+%doc LICENSE Copying
+%endif
+%doc Changes Credits README.md
+%doc %{perl_vendorlib}/MCE.pod
+%doc %{perl_vendorlib}/MCE/Core.pod
+%doc %{perl_vendorlib}/MCE/Examples.pod
+%dir %{perl_vendorlib}/MCE/
+%dir %{perl_vendorlib}/MCE/Core/
+%{perl_vendorlib}/MCE.pm
+%{perl_vendorlib}/MCE/Candy.pm
+%{perl_vendorlib}/MCE/Core/Input/
+%{perl_vendorlib}/MCE/Core/Manager.pm
+%{perl_vendorlib}/MCE/Core/Validation.pm
+%{perl_vendorlib}/MCE/Core/Worker.pm
+%{perl_vendorlib}/MCE/Flow.pm
+%{perl_vendorlib}/MCE/Grep.pm
+%{perl_vendorlib}/MCE/Loop.pm
+%{perl_vendorlib}/MCE/Map.pm
+%{perl_vendorlib}/MCE/Mutex.pm
+%{perl_vendorlib}/MCE/Queue.pm
+%{perl_vendorlib}/MCE/Relay.pm
+%{perl_vendorlib}/MCE/Signal.pm
+%{perl_vendorlib}/MCE/Step.pm
+%{perl_vendorlib}/MCE/Stream.pm
+%{perl_vendorlib}/MCE/Subs.pm
+%{perl_vendorlib}/MCE/Util.pm
+%{_mandir}/man3/MCE.3*
+%{_mandir}/man3/MCE::Candy.3*
+%{_mandir}/man3/MCE::Core.3*
+%{_mandir}/man3/MCE::Examples.3*
+%{_mandir}/man3/MCE::Flow.3*
+%{_mandir}/man3/MCE::Grep.3*
+%{_mandir}/man3/MCE::Loop.3*
+%{_mandir}/man3/MCE::Map.3*
+%{_mandir}/man3/MCE::Mutex.3*
+%{_mandir}/man3/MCE::Queue.3*
+%{_mandir}/man3/MCE::Relay.3*
+%{_mandir}/man3/MCE::Signal.3*
+%{_mandir}/man3/MCE::Step.3*
+%{_mandir}/man3/MCE::Stream.3*
+%{_mandir}/man3/MCE::Subs.3*
+%{_mandir}/man3/MCE::Util.3*

 %files tools
 %{_bindir}/mce_grep

 %changelog
+* Wed Mar 16 2016 Paul Howarth <paul@city-fan.org> - 1.702-1
+- Update to 1.702
+- Use a patch to fix unversioned provides of perl(MCE)
+- Get rid of redundant provides/requires filters
+- Make %%files list more explicit
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.608-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-79f25d768966a1c57f2ad404d1fd9e8d  MCE-1.608.tar.gz
+0e4cd943aa9ef47dfc6b39cc8dc6f19d  MCE-1.702.tar.gz