diff --git a/.gitignore b/.gitignore index bd615c1..942ed11 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /Encode-2.94.tar.gz /Encode-2.95.tar.gz /Encode-2.96.tar.gz +/Encode-2.97.tar.gz diff --git a/Encode-2.96-Fix-https-rt.cpan.org-Ticket-Display.html-id-124399.patch b/Encode-2.96-Fix-https-rt.cpan.org-Ticket-Display.html-id-124399.patch deleted file mode 100644 index 863a030..0000000 --- a/Encode-2.96-Fix-https-rt.cpan.org-Ticket-Display.html-id-124399.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cfaedb2beda37cbc3575ee818c3c83ea87673c32 Mon Sep 17 00:00:00 2001 -From: Karl Williamson -Date: Wed, 14 Feb 2018 15:47:46 -0700 -Subject: [PATCH] Fix https://rt.cpan.org/Ticket/Display.html?id=124399 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Encode 2.95 broke this module, which is testing for a particular warning -message. It was not my intent to change any part of the API with the -commits that comprise 2.95, and it turns out that the message is -different only in one or two perl versions where an interaction with a -deprecation caused the new message to be displayed. - -The commit here just keeps the old code being used into the 5.27 series. -It probably could work starting in 5.27.2, but its easier to use a -marker of the existence of a newer function, and since the affected -versions are all development releases, I went with the marker. - -Signed-off-by: Petr Písař ---- - Encode.xs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Encode.xs b/Encode.xs -index 91c5257..13eb15d 100644 ---- a/Encode.xs -+++ b/Encode.xs -@@ -387,7 +387,7 @@ strict_utf8(pTHX_ SV* sv) - } - - /* Modern perls have the capability to do this more efficiently and portably */ --#ifdef is_utf8_string_loc_flags -+#ifdef utf8n_to_uvchr_msgs - # define CAN_USE_BASE_PERL - #endif - --- -2.13.6 - diff --git a/perl-Encode.spec b/perl-Encode.spec index a6a0df4..52f9a0e 100644 --- a/perl-Encode.spec +++ b/perl-Encode.spec @@ -1,6 +1,6 @@ # Because encoding sub-package has an independent version, version macro gets # redefined. -%global cpan_version 2.96 +%global cpan_version 2.97 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: 2%{?dist} +Release: 3%{?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 -# Preserve a warning on Perl 5.26.1, bug #1544345, CPAN RT#124399 -Patch0: Encode-2.96-Fix-https-rt.cpan.org-Ticket-Display.html-id-124399.patch BuildRequires: findutils BuildRequires: gcc BuildRequires: make @@ -128,7 +126,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 @@ -169,6 +166,9 @@ make test %{perl_vendorarch}/Encode/encode.h %changelog +* Wed Feb 21 2018 Petr Pisar - 4:2.97-3 +- 2.97 bump + * Mon Feb 19 2018 Petr Pisar - 4:2.96-2 - Preserve a warning on Perl 5.26.1 (bug #1544345) diff --git a/sources b/sources index d5a94bc..7849b91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Encode-2.96.tar.gz) = abd25f4959183fb3c77fd4c3d0fa152b7f8bec069c1f9cadc3f00a944b44dae31ab8de991fdaa4b313b6272af9fa9358ba1eb7d14d0d8ca01ad8027066bdb835 +SHA512 (Encode-2.97.tar.gz) = 26815069bc726fa1f990547dc40d5eacbd03edf49b409c5cacc5fcb4aa60838714654da502afc6f0465490a5d518548f670fdcdfa2da33958b6c38cdd6293a2d