From 02b3f82b5fe6104f0ea45a87396424c8e915efa3 Mon Sep 17 00:00:00 2001
From: Paul Howarth <p...@city-fan.org>
Date: Wed, 15 Feb 2017 11:51:17 +0000
Subject: Update to 1.812

- New upstream release 1.812
  - Bumped minimum requirement for Sereal to 3.015 when available; added
    regression ensuring matching version for Encoder and Decoder
- Add patch to avoid unintentional hard dependencies on Sereal
---
 .gitignore                  |  1 +
 MCE-1.812-Sereal-deps.patch | 16 ++++++++++++++++
 perl-MCE.spec               | 16 +++++++++++++---
 sources                     |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 MCE-1.812-Sereal-deps.patch

diff --git a/.gitignore b/.gitignore
index db69e77..bbcbc25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /MCE-1.809.tar.gz
 /MCE-1.810.tar.gz
 /MCE-1.811.tar.gz
+/MCE-1.812.tar.gz
diff --git a/MCE-1.812-Sereal-deps.patch b/MCE-1.812-Sereal-deps.patch
new file mode 100644
index 0000000..5fe3025
--- /dev/null
+++ b/MCE-1.812-Sereal-deps.patch
@@ -0,0 +1,16 @@
+Upstream's syntax is mis-parsed by the rpm dependency generator as a hard 
requirement.
+
+--- lib/MCE.pm
++++ lib/MCE.pm
+@@ -39,10 +39,7 @@ BEGIN {
+    eval 'use PDL::IO::Storable'        if $INC{'PDL.pm'};
+ 
+    if (!exists $INC{'PDL.pm'}) {
+-      eval '
+-         use Sereal::Encoder 3.015 qw( encode_sereal );
+-         use Sereal::Decoder 3.015 qw( decode_sereal );
+-      ';
++      eval 'use Sereal::Encoder 3.015 qw( encode_sereal ); use 
Sereal::Decoder 3.015 qw( decode_sereal );';
+       if ( !$@ ) {
+          my $_encoder_ver = int( Sereal::Encoder->VERSION() );
+          my $_decoder_ver = int( Sereal::Decoder->VERSION() );
diff --git a/perl-MCE.spec b/perl-MCE.spec
index 7f34f6d..158ce11 100644
--- a/perl-MCE.spec
+++ b/perl-MCE.spec
@@ -1,11 +1,12 @@
 Name:           perl-MCE
-Version:        1.811
+Version:        1.812
 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
 Patch0:         MCE-1.600-Fix-sharp-bang-line.patch
+Patch1:         MCE-1.812-Sereal-deps.patch
 BuildArch:      noarch
 # Module Build
 BuildRequires:  coreutils
@@ -46,8 +47,8 @@ Requires:       perl(threads::shared)
 
 # MCE prefers to use Sereal if available
 %if 0%{?fedora} > 23 || 0%{?rhel} > 6
-BuildRequires:  perl(Sereal)
-Requires:       perl(Sereal)
+BuildRequires:  perl(Sereal) >= 3.015
+Requires:       perl(Sereal) >= 3.015
 %endif
 
 %description
@@ -73,6 +74,9 @@ the Many-core Engine (MCE) Perl library.
 # Fix sharp-bang line
 %patch0 -p1
 
+# Avoid hard dependencies on Sereal
+%patch1
+
 %build
 MCE_INSTALL_TOOLS=1 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -136,6 +140,12 @@ make test
 %{_bindir}/mce_grep
 
 %changelog
+* Wed Feb 15 2017 Paul Howarth <p...@city-fan.org> - 1.812-1
+- Update to 1.812
+  - Bumped minimum requirement for Sereal to 3.015 when available; added
+    regression ensuring matching version for Encoder and Decoder
+- Add patch to avoid unintentional hard dependencies on Sereal
+
 * Tue Feb 14 2017 Paul Howarth <p...@city-fan.org> - 1.811-1
 - Update to 1.811
   - Fixed bug in MCE::Queue (dequeue_nb) when queue has zero items
diff --git a/sources b/sources
index ed813ab..a0e9372 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (MCE-1.811.tar.gz) = 
f51d81e2500c7be8e40145203962461edd2c7f787e96ec911344365b81f9cf695ede315def57b0b1a7342363a41e0df4d9234b6fa59b63d210e2e4cf612a3ac8
+SHA512 (MCE-1.812.tar.gz) = 
8a67004b16a809d108720de9d303595016ccdd79326afcff1933394746a6c0d0556c2b8bfebdbd06fa3d29325caf6f12a3e1963e2859607e37a5e185cb90a542
-- 
cgit v1.1


        
https://src.fedoraproject.org/cgit/perl-MCE.git/commit/?h=master&id=02b3f82b5fe6104f0ea45a87396424c8e915efa3
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to