diff --git a/RPC-XML-0.60-rev127.dif b/RPC-XML-0.60-rev127.dif deleted file mode 100644 index 4003520..0000000 --- a/RPC-XML-0.60-rev127.dif +++ /dev/null @@ -1,30 +0,0 @@ -Index: t/40_server.t -=================================================================== ---- t/40_server.t.orig -+++ t/40_server.t -@@ -164,8 +164,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2 - # 22/09/2008 - Just allow for anything the user has attached to this address. - # Aliases keep causing this test to falsely fail. - my @localhostinfo = gethostbyname('localhost'); -+my $loc_reverse = gethostbyaddr(inet_aton("127.0.0.1"),AF_INET); - my $localIP = join('.', unpack('C4', $localhostinfo[4])); --my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1])); -+my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1]), $loc_reverse); - for (@allhosts) { s/\./\\./g } - # Per RT 27778: For some reason gethostbyname('localhost') does not return - # "localhost" on win32 -Index: t/40_server_xmllibxml.t -=================================================================== ---- t/40_server_xmllibxml.t.orig -+++ t/40_server_xmllibxml.t -@@ -80,8 +80,9 @@ isa_ok($srv, 'RPC::XML::Server', '$srv<2 - # 22/09/2008 - Just allow for anything the user has attached to this address. - # Aliases keep causing this test to falsely fail. - my @localhostinfo = gethostbyname('localhost'); -+my $loc_reverse = gethostbyaddr(inet_aton("127.0.0.1"),AF_INET); - my $localIP = join('.', unpack('C4', $localhostinfo[4])); --my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1])); -+my @allhosts = ($localIP, $localhostinfo[0], split(' ', $localhostinfo[1]), $loc_reverse); - for (@allhosts) { s/\./\\./g } - # Per RT 27778: For some reason gethostbyname('localhost') does not return - # "localhost" on win32 diff --git a/RPC-XML-0.76-extern_ent.dif b/RPC-XML-0.76-extern_ent.dif deleted file mode 100644 index 22e055c..0000000 --- a/RPC-XML-0.76-extern_ent.dif +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/RPC/XML/Parser/XMLParser.pm.orig 2012-06-04 16:10:31.000000000 +0000 -+++ ./lib/RPC/XML/Parser/XMLParser.pm 2012-06-04 16:11:04.000000000 +0000 -@@ -39,7 +39,7 @@ use strict; - use warnings; - use vars qw($VERSION); - use subs qw(error stack_error new message_init message_end tag_start tag_end -- final char_data parse); -+ final char_data parse extern_ent); - use base 'RPC::XML::Parser'; - - # I'm not ready to add Readonly to my list of dependencies... diff --git a/RPC-XML-0.78-reproducible.diff b/RPC-XML-0.78-reproducible.diff deleted file mode 100644 index fbfcda0..0000000 --- a/RPC-XML-0.78-reproducible.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: RPC-XML-0.78/etc/make_method -=================================================================== ---- RPC-XML-0.78.orig/etc/make_method -+++ RPC-XML-0.78/etc/make_method -@@ -399,7 +399,7 @@ sub write_file - - - diff --git a/RPC-XML-0.79.tar.gz b/RPC-XML-0.79.tar.gz deleted file mode 100644 index 6bc886c..0000000 --- a/RPC-XML-0.79.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9822ffcfbea9c2bddef00507dc93f7acb83589e6ff6460ca7040f147aeebf9a9 -size 209612 diff --git a/RPC-XML-0.80.tar.gz b/RPC-XML-0.80.tar.gz new file mode 100644 index 0000000..6e62911 --- /dev/null +++ b/RPC-XML-0.80.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea0d7ca87aab70c12817df5893f6bfe0492ce63f6e0e63c0b452e375344c7ef7 +size 211223 diff --git a/cpanspec.yml b/cpanspec.yml index a5c1f80..b892f43 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -5,13 +5,8 @@ # - source1 # - source2 patches: - #PATCH-FIX-OPENSUSE - ro@suse.de - fix build in chroot/buildservice - RPC-XML-0.60-rev127.dif: - RPC-XML-0.76-extern_ent.dif: #PATCH-FIX-UPSTREAM - coolo@suse.de RT#86187 RPC-XML-0.77-fixtest.dif: -p1 - #PATCH-FIX-OPENSUSE - coolo@suse.de reproducible builds - RPC-XML-0.78-reproducible.diff: -p1 # foo.patch: -p1 # bar.patch: #preamble: |- diff --git a/perl-RPC-XML.changes b/perl-RPC-XML.changes index 57245d9..84cd2dc 100644 --- a/perl-RPC-XML.changes +++ b/perl-RPC-XML.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Thu Aug 22 12:35:17 CEST 2019 - Tina Mueller + +- Remove patches not needed anymore: + * RPC-XML-0.60-rev127.dif + * RPC-XML-0.76-extern_ent.dif + * RPC-XML-0.78-reproducible.diff + +------------------------------------------------------------------- +Wed Apr 3 07:27:15 UTC 2019 - Stephan Kulow + +- updated to 0.80 + see /usr/share/doc/packages/perl-RPC-XML/ChangeLog + + 0.80 Sunday May 8, 2016, 12:45:00 PM -0700 + + * etc/make_method + Make the build reproducible by dropping timestamps in + make_method output. (Niko Tyni) + + * t/40_server.t + * t/40_server_xmllibxml.t + * t/50_client.t + Fixes for test problems with Strawberry Perl. + + * lib/RPC/XML/Client.pm + Fix leak caused by failing to free Expat parser. We don't want + to return from the method until the parser's been freed. We + therefore need to call $parser->release() before the return + statements caused by request failures. (Tom Grimwood-Taylor) + + * lib/RPC/XML/Server.pm + One socket-opt change, one typo corrected. + + * lib/RPC/XML.pm + Applied patch for numeric regexes and critic cleanup. Addresses + GitHub pull request #10 and RT #111636. + + * t/60_net_server.t + RT #99578: Work-around fix for Net::Server+IO::Socket::IP. If a + system's IPv6 declaration of localhost was before the IPv4 + declaration in the hosts file, this test would fail. + ------------------------------------------------------------------- Tue Mar 8 08:54:25 UTC 2016 - coolo@suse.com diff --git a/perl-RPC-XML.spec b/perl-RPC-XML.spec index b6d9ff2..45f39a7 100644 --- a/perl-RPC-XML.spec +++ b/perl-RPC-XML.spec @@ -1,7 +1,7 @@ # # spec file for package perl-RPC-XML # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,36 +12,33 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: perl-RPC-XML -Version: 0.79 +Version: 0.80 Release: 0 %define cpan_name RPC-XML -Summary: Set of Classes for Core Data, Message and Xml Handling -License: Artistic-1.0 or GPL-1.0+ +Summary: Set of classes for core data, message and XML handling +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/RPC-XML/ -Source0: http://www.cpan.org/authors/id/R/RJ/RJRAY/%{cpan_name}-0.79.tar.gz +Url: https://metacpan.org/release/%{cpan_name} +Source0: https://cpan.metacpan.org/authors/id/R/RJ/RJRAY/%{cpan_name}-%{version}.tar.gz Source1: cpanspec.yml -Patch0: RPC-XML-0.60-rev127.dif -Patch1: RPC-XML-0.76-extern_ent.dif -Patch2: RPC-XML-0.77-fixtest.dif -Patch3: RPC-XML-0.78-reproducible.diff +Patch0: RPC-XML-0.77-fixtest.dif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(LWP) >= 5.834 BuildRequires: perl(Module::Load) >= 0.24 -BuildRequires: perl(Scalar::Util) >= 1.19 +BuildRequires: perl(Scalar::Util) >= 1.33 BuildRequires: perl(Test::More) >= 0.94 BuildRequires: perl(XML::Parser) >= 2.31 Requires: perl(LWP) >= 5.834 Requires: perl(Module::Load) >= 0.24 -Requires: perl(Scalar::Util) >= 1.19 +Requires: perl(Scalar::Util) >= 1.33 Requires: perl(Test::More) >= 0.94 Requires: perl(XML::Parser) >= 2.31 Recommends: perl(Compress::Raw::Zlib) >= 2.063 @@ -68,17 +65,14 @@ respectively. %prep %setup -q -n %{cpan_name}-%{version} find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 -##%patch0 -%patch1 -%patch2 -p1 -%patch3 -p1 +%patch0 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} %check -%{__make} test +make test %install %perl_make_install