diff --git a/Cpanel-JSON-XS-3.0204-signature.patch b/Cpanel-JSON-XS-3.0204-signature.patch new file mode 100644 index 0000000..e6dfc42 --- /dev/null +++ b/Cpanel-JSON-XS-3.0204-signature.patch @@ -0,0 +1,8 @@ +--- t/z_kwalitee.t ++++ t/z_kwalitee.t +@@ -23,4 +23,4 @@ plan skip_all => "Test::Kwalitee require + plan skip_all => 'Test::Kwalitee fails with clang -faddress-sanitizer' + if $Config{ccflags} =~ /-faddress-sanitizer/; + +-Test::Kwalitee->import( tests => [ qw( -use_strict ) ] ); ++Test::Kwalitee->import( tests => [ qw( -use_strict -valid_signature ) ] ); diff --git a/perl-Cpanel-JSON-XS.spec b/perl-Cpanel-JSON-XS.spec index cbbeda3..d760f31 100644 --- a/perl-Cpanel-JSON-XS.spec +++ b/perl-Cpanel-JSON-XS.spec @@ -1,10 +1,11 @@ Name: perl-Cpanel-JSON-XS Summary: JSON::XS for Cpanel, fast and correct serializing -Version: 3.0203 +Version: 3.0204 Release: 1%{?dist} License: GPL+ or Artistic URL: http://search.cpan.org/dist/Cpanel-JSON-XS/ Source0: http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-%{version}.tar.gz +Patch0: Cpanel-JSON-XS-3.0204-signature.patch # Module Build BuildRequires: coreutils BuildRequires: findutils @@ -50,7 +51,7 @@ BuildRequires: perl(common::sense) >= 3.5 BuildRequires: perl(Hash::Util) BuildRequires: perl(JSON) BuildRequires: perl(JSON::XS) -%if %{?fedora:1} +%if 0%{?fedora:1} BuildRequires: perl(Mojo::JSON) >= 6.11 %endif BuildRequires: perl(Test::LeakTrace) @@ -88,6 +89,9 @@ reach the latter goal it was written in C. # Fix shellbangs perl -pi -e 's|^#!/opt/bin/perl|#!/usr/bin/perl|' eg/* +# Skip the signature check as we've tweaked some files +%patch0 + %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} @@ -116,6 +120,11 @@ make test %{!?perl_bootstrap:AUTHOR_TESTING=1} %{_mandir}/man3/Cpanel::JSON::XS::Boolean.3* %changelog +* Fri Nov 27 2015 Paul Howarth - 3.0204-1 +- Update to 3.0204 + - Fix is_bool with JSON::XS >3.0 interop (GH#44) +- Avoid running signature tests as we fix shellbangs in example code + * Thu Nov 26 2015 Paul Howarth - 3.0203-1 - Update to 3.0203 - Simplify handling of references, removing all the complicated work-around @@ -142,6 +151,7 @@ make test %{!?perl_bootstrap:AUTHOR_TESTING=1} - New optional decode_json() argument to set allow_nonref as in RFC 7159 and PHP; before 3.02, JSON::XS and Cpanel::JSON::XS always allowed nonref values for decode_json due to an internal bug + - With canonical only skip hash keys sorting for actually tied hashes (GH#42) - Explicitly BR: perl-devel, needed for EXTERN.h * Thu Jun 18 2015 Fedora Release Engineering - 3.0115-4 diff --git a/sources b/sources index aefdc86..4848935 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -131896dd0842312d7c1e819ca6074c6c Cpanel-JSON-XS-3.0203.tar.gz +437869a17331e9b99b6de3c64b13591a Cpanel-JSON-XS-3.0204.tar.gz