commit 30c54647dd9c3b435a5361624fc3bc3ef9a7ad67
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Thu Jul 31 13:34:06 2014 +0200
2.38 bump
.gitignore | 1 +
perl-Data-Dump-Streamer-2.36-json-xs.patch | 88 ----------------------------
perl-Data-Dump-Streamer-2.38-json-xs.patch | 59 +++++++++++++++++++
perl-Data-Dump-Streamer.spec | 9 ++-
sources | 2 +-
5 files changed, 67 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2bfcb8..28187a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ Data-Dump-Streamer-2.22.tar.gz
/Data-Dump-Streamer-2.33.tar.gz
/Data-Dump-Streamer-2.34.tar.gz
/Data-Dump-Streamer-2.36.tar.gz
+/Data-Dump-Streamer-2.38.tar.gz
diff --git a/perl-Data-Dump-Streamer-2.38-json-xs.patch b/perl-Data-Dump-Streamer-2.38-json-xs.patch
new file mode 100644
index 0000000..80c1c36
--- /dev/null
+++ b/perl-Data-Dump-Streamer-2.38-json-xs.patch
@@ -0,0 +1,59 @@
+diff -up Data-Dump-Streamer-2.38/t/madness_json.t.orig Data-Dump-Streamer-2.38/t/madness_json.t
+--- Data-Dump-Streamer-2.38/t/madness_json.t.orig 2014-07-31 12:56:49.905473777 +0200
++++ Data-Dump-Streamer-2.38/t/madness_json.t 2014-07-31 13:05:42.083214542 +0200
+@@ -248,6 +248,11 @@ format STDOUT =
+ JSB => $jstrue,
+ );
+
++ # Versions of JSON::XS prior to 3.00 return obsolete JSON::XS::Boolean
++ # which will be removed in future.
++ my $jsbool_class = $JSON::XS::VERSION < 3.000_000 ?
++ 'JSON::XS::Boolean' : 'JSON::PP::Boolean';
++
+ my $expect;
+ my $json_bool_class = ref( $jstrue );
+ # Dumping differences per perl version:
+@@ -287,7 +292,7 @@ _EOF_FORMAT_
+ RV => \do { my $v = expected_dot },
+ UND => undef
+ };
+-bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
++bless( $HASH1->{JSB}, 'jsbool_class' );
+ EXPECT
+ require B::Deparse;
+ if (new B::Deparse -> coderef2text (
+@@ -327,7 +332,7 @@ _EOF_FORMAT_
+ RV => \do { my $v = expected_dot },
+ UND => undef
+ };
+-bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
++bless( $HASH1->{JSB}, 'jsbool_class' );
+ EXPECT
+ }
+ elsif ( $] >= 5.008_000 ) {
+@@ -361,7 +366,7 @@ _EOF_FORMAT_
+ RV => \do { my $v = expected_dot },
+ UND => undef
+ };
+-bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
++bless( $HASH1->{JSB}, 'jsbool_class' );
+ EXPECT
+ }
+ else {
+@@ -387,14 +392,14 @@ $HASH1 = {
+ RV => \do { my $v = expected_dot },
+ UND => undef
+ };
+-bless( $HASH1->{JSB}, 'JSON::XS::Boolean' );
++bless( $HASH1->{JSB}, 'jsbool_class' );
+ EXPECT
+ }
+ # In JSON::XS < 3, the boolean class is JSON::XS::Boolean
+ # In JSON::XS >= 3, the boolean class is JSON::PP::Boolean
+ my $json_boolean_class = ref JSON::XS::decode_json("true");
+ $expect =~ s{JSON::XS::Boolean}{$json_boolean_class}g;
+- same( $dump= $o->Data(\%hash)->Out, template( $expect, expected_dot => $expected_dot ), "", $o);
++ same( $dump= $o->Data(\%hash)->Out, template( $expect, expected_dot => $expected_dot, jsbool_class => $jsbool_class ), "", $o);
+ }
+
+ sub template {
diff --git a/perl-Data-Dump-Streamer.spec b/perl-Data-Dump-Streamer.spec
index 3326268..34a7ddb 100644
--- a/perl-Data-Dump-Streamer.spec
+++ b/perl-Data-Dump-Streamer.spec
@@ -1,12 +1,12 @@
Name: perl-Data-Dump-Streamer
-Version: 2.36
-Release: 2%{?dist}
+Version: 2.38
+Release: 1%{?dist}
Summary: Accurately serialize a data structure as Perl code
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Data-Dump-Streamer/
Source0: http://search.cpan.org/CPAN/authors/id/Y/YV/YVES/Data-Dump-Streamer-%{version}.tar.gz
-Patch0: perl-Data-Dump-Streamer-2.36-json-xs.patch
+Patch0: perl-Data-Dump-Streamer-2.38-json-xs.patch
BuildRequires: perl(Algorithm::Diff)
BuildRequires: perl(B::Utils)
BuildRequires: perl(Compress::Zlib)
@@ -61,6 +61,9 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
%{_mandir}/man3/*
%changelog
+* Thu Jul 31 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 2.38-1
+- 2.38 bump
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 2.36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 2586ea5..c7f6cc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7743bc698d1e0eb1caba849d3e0fae2c Data-Dump-Streamer-2.36.tar.gz
+ca6fa9ef3a29a9c423f78db3a4ff126a Data-Dump-Streamer-2.38.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
