From 01687f2e6f4fdf7109e206b58f23cc0cc69f21b1 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 9 Aug 2016 13:15:05 +0200
Subject: [PATCH] 7.22 bump

---
 .gitignore                                                 | 1 +
 ...=> ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch | 6 ++----
 perl-ExtUtils-MakeMaker.spec                               | 7 +++++--
 sources                                                    | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 rename ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch => ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch (79%)

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.22-Unbundle-Encode-Locale.patch
similarity index 79%
rename from ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
rename to ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
index fafe623..439488b 100644
--- a/ExtUtils-MakeMaker-7.00-Unbundle-Encode-Locale.patch
+++ b/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch
@@ -15,19 +15,17 @@ 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;
+@@ -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') }
--  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';
+   if $CAN_DECODE and Encode::find_encoding('locale')->name eq 'ascii';
  
  our $Verbose = 0;       # exported
- our @Parent;            # needs to be localized
 -- 
 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 <jplesnik@redhat.com> - 7.22-1
+- 7.22 bump
+
 * Tue May 24 2016 Petr Pisar <ppisar@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