diff --git a/.gitignore b/.gitignore index 1a87831..171498a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ RPC-XML-0.69.tar.gz /RPC-XML-0.74.tar.gz /RPC-XML-0.76.tar.gz /RPC-XML-0.77.tar.gz +/RPC-XML-0.78.tar.gz diff --git a/RPC-XML-0.77-hash_key_ordering.patch b/RPC-XML-0.77-hash_key_ordering.patch deleted file mode 100644 index b6c3757..0000000 --- a/RPC-XML-0.77-hash_key_ordering.patch +++ /dev/null @@ -1,121 +0,0 @@ -From f6cee931344ffa6a757eb526b02de33c30b672f8 Mon Sep 17 00:00:00 2001 -From: "Randy J. Ray" -Date: Thu, 30 May 2013 19:46:42 -0700 -Subject: [PATCH 1/2] Force key-ordering in struct as_string and serialize. Was - getting some intermittent bug reports of failures in t/15_serialize.t that - amounted to the keys in a fault struct not being in consistent order. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -Signed-off-by: Petr Písař ---- - lib/RPC/XML.pm | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/RPC/XML.pm b/lib/RPC/XML.pm -index e6099a7..59e6963 100644 ---- a/lib/RPC/XML.pm -+++ b/lib/RPC/XML.pm -@@ -844,7 +844,7 @@ sub as_string - ("$_", - $clean{$_}, - '') -- } (keys %clean)), -+ } (sort keys %clean)), - ''; - } - -@@ -856,7 +856,7 @@ sub serialize - my $key; - - print {$fh} ''; -- for (keys %{$self}) -+ for (sort keys %{$self}) - { - ($key = $_) =~ s/$RPC::XML::XMLRE/$RPC::XML::XMLMAP{$1}/ge; - utf8::downgrade($key); -@@ -1096,7 +1096,7 @@ sub length ## no critic (ProhibitBuiltinHomonyms) - my $cnt = 0; - - $self->{fh_pos} = tell $self->{value_fh}; -- seek$self->{value_fh}, 0, 0; -+ seek $self->{value_fh}, 0, 0; - while ($cnt = read $self->{value_fh}, $buf, 60*57) - { - $len += length(MIME::Base64::encode_base64($buf, q{})); --- -1.8.1.4 - - -From 33617691326a0bc01efea624e05c65047f1c6154 Mon Sep 17 00:00:00 2001 -From: "Randy J. Ray" -Date: Wed, 5 Jun 2013 21:13:38 -0700 -Subject: [PATCH 2/2] Undo the previous change and fix the test. The previous - change didn't feel right, so this rolls it back and fixes the problem at the - level of the test, instead. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - -Signed-off-by: Petr Písař ---- - lib/RPC/XML.pm | 4 ++-- - t/15_serialize.t | 17 ++++++++++++++++- - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/lib/RPC/XML.pm b/lib/RPC/XML.pm -index 59e6963..4d4eae1 100644 ---- a/lib/RPC/XML.pm -+++ b/lib/RPC/XML.pm -@@ -844,7 +844,7 @@ sub as_string - ("$_", - $clean{$_}, - '') -- } (sort keys %clean)), -+ } (keys %clean)), - ''; - } - -@@ -856,7 +856,7 @@ sub serialize - my $key; - - print {$fh} ''; -- for (sort keys %{$self}) -+ for (keys %{$self}) - { - ($key = $_) =~ s/$RPC::XML::XMLRE/$RPC::XML::XMLMAP{$1}/ge; - utf8::downgrade($key); -diff --git a/t/15_serialize.t b/t/15_serialize.t -index ad0d64d..f894f49 100644 ---- a/t/15_serialize.t -+++ b/t/15_serialize.t -@@ -96,7 +96,22 @@ seek $ofh, 0, 0; - $data = ''; - read $ofh, $data, -s $ofh; - --is($data, $faux_res->as_string, 'Fault-response content is correct'); -+# There have been some changes to how Perl handles iteration of hash keys. -+# As a result, this test has started failing a lot because of the order of -+# keys when serialized doesn't match the order of keys from as_string(). So -+# to get around this, just compare it to both variations that can occur. -+my $variant1 = '' . -+ 'faultString' . -+ 'testfaultCode' . -+ '1'; -+my $variant2 = '' . -+ 'faultCode1' . -+ 'faultStringtest' . -+ ''; -+ok( -+ ($data eq $variant1) || ($data eq $variant2), -+ 'Fault-response content is correct' -+); - - close $ofh; - unlink $tmpfile; --- -1.8.1.4 - diff --git a/perl-RPC-XML.spec b/perl-RPC-XML.spec index 54d5089..420e4ae 100644 --- a/perl-RPC-XML.spec +++ b/perl-RPC-XML.spec @@ -1,19 +1,16 @@ %global cpan_name RPC-XML Name: perl-%{cpan_name} -Version: 0.77 -Release: 4%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Set of classes for core data, message and XML handling Group: Development/Libraries License: Artistic 2.0 or LGPLv2 URL: http://search.cpan.org/dist/%{cpan_name}/ Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJRAY/%{cpan_name}-%{version}.tar.gz Source1: README.license -# Adjust tests for perl 5.18, CPAN RT#86187, -# from -Patch0: RPC-XML-0.77-hash_key_ordering.patch BuildArch: noarch - +BuildRequires: perl BuildRequires: perl(Cwd) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) >= 0.8 @@ -30,6 +27,7 @@ BuildRequires: perl(HTTP::Status) BuildRequires: perl(IO::Handle) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(MIME::Base64) +BuildRequires: perl(Module::Load) >= 0.24 BuildRequires: perl(Scalar::Util) >= 1.19 BuildRequires: perl(URI) BuildRequires: perl(XML::Parser) >= 2.31 @@ -40,6 +38,7 @@ BuildRequires: perl(Apache::File) BuildRequires: perl(CGI) BuildRequires: perl(Socket) # Recommended run-time: +# Keep Compress::Raw::Zlib optional BuildRequires: perl(DateTime) >= 0.70 BuildRequires: perl(DateTime::Format::ISO8601) >= 0.07 BuildRequires: perl(LWP) >= 5.834 @@ -53,22 +52,24 @@ BuildRequires: perl(Compress::Zlib) BuildRequires: perl(Digest::MD5) BuildRequires: perl(Net::Server) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(constant) >= 1.03 Requires: perl(File::Spec) >= 0.8 Requires: perl(HTTP::Daemon) Requires: perl(LWP) >= 5.834 Requires: perl(MIME::Base64) +Requires: perl(Module::Load) >= 0.24 Requires: perl(Scalar::Util) >= 1.19 Requires: perl(XML::Parser) >= 2.31 # Recommended +# Keep Compress::Raw::Zlib optional Requires: perl(DateTime) >= 0.70 Requires: perl(DateTime::Format::ISO8601) >= 0.07 Requires: perl(XML::LibXML) >= 1.85 %perl_default_filter # Remove underspecified symbols -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(constant|File::Spec|Scalar::Util|XML::LibXML|XML::Parser\\)\\s*$ +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(constant|File::Spec|Module::Load|Scalar::Util|XML::LibXML|XML::Parser\\)\\s*$ %description The RPC::XML package is an implementation of XML-RPC. The module provides @@ -80,9 +81,8 @@ used by them. %package -n perl-Apache-RPC Summary: Companion packages for RPC::XML tuned for mod_perl environments Group: Development/Libraries -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(File::Spec) >= 0.8 -Requires: perl(RPC::XML::Server) %description -n perl-Apache-RPC This package contains Apache::RPC::Server and Apache::RPC::Status, useful for @@ -91,7 +91,6 @@ running RPC::XML under mod_perl. %prep %setup -qn %{cpan_name}-%{version} -%patch0 -p1 cp -p %{SOURCE1} . %build @@ -119,6 +118,9 @@ make test %{perl_vendorlib}/Apache %changelog +* Mon Feb 10 2014 Petr Pisar - 0.78-1 +- 0.78 bump + * Sun Aug 04 2013 Fedora Release Engineering - 0.77-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index b0ce733..30e68c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e4ca7039456dba74b9719b57bb86ad3 RPC-XML-0.77.tar.gz +6a4519dbc5130d872c13a7a23309f36b RPC-XML-0.78.tar.gz