From dc0104d0dc45e012b3dc2f8b7a50085348cd8c73 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jples...@redhat.com>
Date: Tue, 9 Aug 2016 13:15:05 +0200
Subject: 7.22 bump
---
.gitignore | 1 +
...ils-MakeMaker-7.00-Unbundle-Encode-Locale.patch | 33 ----------------------
...ils-MakeMaker-7.22-Unbundle-Encode-Locale.patch | 31 ++++++++++++++++++++
perl-ExtUtils-MakeMaker.spec | 7 +++--
sources | 2 +-
5 files changed, 38 insertions(+), 36 deletions(-)
delete mode 100644 ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
create mode 100644 ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
diff --git a/.gitignore b/.gitignore
index 5a63c2d..59b9d70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/ExtUtils-MakeMaker-7.14.tar.gz
/ExtUtils-MakeMaker-7.16.tar.gz
/ExtUtils-MakeMaker-7.18.tar.gz
+/ExtUtils-MakeMaker-7.22.tar.gz
diff --git a/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
b/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
deleted file mode 100644
index fafe623..0000000
--- a/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 04664fb41a3eaa5bc688c4095107486f8c6d2f4c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Mon, 27 Oct 2014 16:55:18 +0100
-Subject: [PATCH] Unbundle Encode::Locale
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- lib/ExtUtils/MakeMaker.pm | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
-index 04ec5a3..759c079 100644
---- a/lib/ExtUtils/MakeMaker.pm
-+++ b/lib/ExtUtils/MakeMaker.pm
-@@ -10,9 +10,9 @@ use ExtUtils::MakeMaker::Config;
- use version; # ensure we always have version.pm
- use Carp;
- use File::Path;
--my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1
stone
--eval { ExtUtils::MakeMaker::Locale::reinit('UTF-8') }
-- if $CAN_DECODE and $ExtUtils::MakeMaker::Locale::ENCODING_LOCALE eq
'US-ASCII';
-+my $CAN_DECODE = eval { require Encode::Locale; }; # 2 birds, 1 stone
-+eval { Encode::Locale::reinit('UTF-8') }
-+ if $CAN_DECODE and $Encode::Locale::ENCODING_LOCALE eq 'US-ASCII';
-
- our $Verbose = 0; # exported
- our @Parent; # needs to be localized
---
-1.9.3
-
diff --git a/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
b/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
new file mode 100644
index 0000000..439488b
--- /dev/null
+++ b/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
@@ -0,0 +1,31 @@
+From 04664fb41a3eaa5bc688c4095107486f8c6d2f4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Mon, 27 Oct 2014 16:55:18 +0100
+Subject: [PATCH] Unbundle Encode::Locale
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ lib/ExtUtils/MakeMaker.pm | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
+index 04ec5a3..759c079 100644
+--- a/lib/ExtUtils/MakeMaker.pm
++++ b/lib/ExtUtils/MakeMaker.pm
+@@ -10,8 +10,8 @@ use ExtUtils::MakeMaker::Config;
+ use version; # ensure we always have version.pm
+ use Carp;
+ use File::Path;
+-my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1
stone
+-eval { ExtUtils::MakeMaker::Locale::reinit('UTF-8') }
++my $CAN_DECODE = eval { require Encode::Locale; }; # 2 birds, 1 stone
++eval { Encode::Locale::reinit('UTF-8') }
+ if $CAN_DECODE and Encode::find_encoding('locale')->name eq 'ascii';
+
+ our $Verbose = 0; # exported
+--
+1.9.3
+
diff --git a/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec
index 0a6c4a8..58b8c9c 100644
--- a/perl-ExtUtils-MakeMaker.spec
+++ b/perl-ExtUtils-MakeMaker.spec
@@ -1,7 +1,7 @@
%global cpan_name ExtUtils-MakeMaker
Name: perl-%{cpan_name}
-Version: 7.18
+Version: 7.22
Release: 1%{?dist}
Summary: Create a module Makefile
License: GPL+ or Artistic
@@ -16,7 +16,7 @@ Patch1:
%{cpan_name}-7.12-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules
Patch2: %{cpan_name}-7.04-Unbundle-version.patch
# Unbundle Encode::Locale module
-Patch3: %{cpan_name}-7.00-Unbundle-Encode-Locale.patch
+Patch3: %{cpan_name}-7.22-Unbundle-Encode-Locale.patch
# Provide maybe_command independently, bug #1129443
Patch4:
%{cpan_name}-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch
BuildArch: noarch
@@ -208,6 +208,9 @@ make test
%{_mandir}/man3/ExtUtils::MM::Utils.*
%changelog
+* Tue Aug 09 2016 Jitka Plesnikova <jples...@redhat.com> - 7.22-1
+- 7.22 bump
+
* Tue May 24 2016 Petr Pisar <ppi...@redhat.com> - 7.18-1
- 7.18 bump
diff --git a/sources b/sources
index 91146b8..09c54a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d280b697a472b1cc8c20e96ebc9a2c7e ExtUtils-MakeMaker-7.18.tar.gz
+d67d345041be9e0cb391aa7f48d45b07 ExtUtils-MakeMaker-7.22.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-ExtUtils-MakeMaker.git/commit/?h=f25&id=dc0104d0dc45e012b3dc2f8b7a50085348cd8c73
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
