From e785fae4bf499a85a7d581aff4e15db12bd1b7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Thu, 22 Jun 2017 14:40:55 +0200 Subject: 2.91 bump
--- .gitignore | 1 + ...e-2.90-Fix-importing-from-Encode-Encoding.patch | 54 ---------------------- perl-Encode.spec | 10 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 Encode-2.90-Fix-importing-from-Encode-Encoding.patch diff --git a/.gitignore b/.gitignore index ad207e1..94313b8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /Encode-2.88.tar.gz /Encode-2.89.tar.gz /Encode-2.90.tar.gz +/Encode-2.91.tar.gz diff --git a/Encode-2.90-Fix-importing-from-Encode-Encoding.patch b/Encode-2.90-Fix-importing-from-Encode-Encoding.patch deleted file mode 100644 index 61153be..0000000 --- a/Encode-2.90-Fix-importing-from-Encode-Encoding.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 82aef7a207f7cccf21026a766968515e53fc1a18 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> -Date: Thu, 22 Jun 2017 13:45:29 +0200 -Subject: [PATCH] Fix importing from Encode::Encoding -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ported to 2.90: - -commit 208d094b8cf82da488495400ea9a518841fd007a -Author: Dan Kogai <[email protected]> -Date: Thu Jun 22 17:05:01 2017 +0900 - - Addressed: https://rt.cpan.org/Ticket/Display.html?id=122167 - -commit a2f702b28b5d93a96b83aff283575b5b155b50ac -Author: Dan Kogai <[email protected]> -Date: Thu Jun 22 18:13:47 2017 +0900 - - Stop directory tweaking $Encode::Encoding{utf8} - -CPAN RT#122167 - -Signed-off-by: Petr Písař <[email protected]> ---- - Encode.pm | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/Encode.pm b/Encode.pm -index b0e9092..8813715 100644 ---- a/Encode.pm -+++ b/Encode.pm -@@ -343,9 +343,14 @@ if ($ON_EBCDIC) { - { - package Encode::utf8; - use parent 'Encode::Encoding'; -- __PACKAGE__->Define('utf8'); -- my $strict_obj = bless { Name => "utf-8-strict", strict_utf8 => 1 } => "Encode::utf8"; -- Encode::define_encoding($strict_obj, 'utf-8-strict'); -+ my %obj = ( -+ 'utf8' => { Name => 'utf8' }, -+ 'utf-8-strict' => { Name => 'utf-8-strict', strict_utf8 => 1 } -+ ); -+ for ( keys %obj ) { -+ bless $obj{$_} => __PACKAGE__; -+ Encode::define_encoding( $obj{$_} => $_ ); -+ } - sub cat_decode { - # ($obj, $dst, $src, $pos, $trm, $chk) - # currently ignores $chk --- -2.9.4 - diff --git a/perl-Encode.spec b/perl-Encode.spec index c6db93f..e20d8a8 100644 --- a/perl-Encode.spec +++ b/perl-Encode.spec @@ -1,6 +1,6 @@ # Because encoding sub-package has independent version, version macro gets # redefined. -%global cpan_version 2.90 +%global cpan_version 2.91 Name: perl-Encode Epoch: 4 Version: %{cpan_version} @@ -8,7 +8,7 @@ Version: %{cpan_version} # perl-encoding sub-package has independent version which does not change # often and consecutive builds would clash on perl-encoding NEVRA. This is the # same case as in perl.spec. -Release: 10%{?dist} +Release: 11%{?dist} Summary: Character encodings in Perl # ucm: UCD # bin/encguess: Artistic 2.0 @@ -16,8 +16,6 @@ Summary: Character encodings in Perl License: (GPL+ or Artistic) and Artistic 2.0 and UCD URL: http://search.cpan.org/dist/Encode/ Source0: http://www.cpan.org/authors/id/D/DA/DANKOGAI/Encode-%{cpan_version}.tar.gz -# Fix "use parent q{Encode::Encoding}", CPAN RT#122167, in upstream after 2.90 -Patch0: Encode-2.90-Fix-importing-from-Encode-Encoding.patch BuildRequires: findutils BuildRequires: gcc BuildRequires: make @@ -127,7 +125,6 @@ your own encoding to perl. No knowledge of XS is necessary. %prep %setup -q -n Encode-%{cpan_version} -%patch0 -p1 %build # Additional scripts can be installed by appending MORE_SCRIPTS, UCM files by @@ -168,6 +165,9 @@ make test %{perl_vendorarch}/Encode/encode.h %changelog +* Thu Jun 22 2017 Petr Pisar <[email protected]> - 4:2.91-11 +- 2.91 bump + * Thu Jun 22 2017 Petr Pisar <[email protected]> - 4:2.90-10 - Fix "use parent q{Encode::Encoding}" (CPAN RT#122167) diff --git a/sources b/sources index 045830b..aec6da0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Encode-2.90.tar.gz) = d30305d55a525fd29fdb2008072aa68658cec440100060d2f7c0434486c1b930c915d566b4d57f431a3e8dd6148b9095b3cd34a19599b1401c9633e535a83f65 +SHA512 (Encode-2.91.tar.gz) = c072ad8d1c98020721cf7659af397fda188c7f6838f9d1e9cfa81564ffa1c7e63aa96f44c04fe1e27012f990f061f942685d1373c5f56823cabacb6627a70fd9 -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-Encode.git/commit/?h=master&id=e785fae4bf499a85a7d581aff4e15db12bd1b7f2 _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
