7.22 bump

This commit is contained in:
Jitka Plesnikova 2016-08-09 13:15:05 +02:00
parent f4fd3bc6fd
commit 01687f2e6f
4 changed files with 9 additions and 7 deletions

1
.gitignore vendored
View File

@ -27,3 +27,4 @@
/ExtUtils-MakeMaker-7.14.tar.gz /ExtUtils-MakeMaker-7.14.tar.gz
/ExtUtils-MakeMaker-7.16.tar.gz /ExtUtils-MakeMaker-7.16.tar.gz
/ExtUtils-MakeMaker-7.18.tar.gz /ExtUtils-MakeMaker-7.18.tar.gz
/ExtUtils-MakeMaker-7.22.tar.gz

View File

@ -15,19 +15,17 @@ diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 04ec5a3..759c079 100644 index 04ec5a3..759c079 100644
--- a/lib/ExtUtils/MakeMaker.pm --- a/lib/ExtUtils/MakeMaker.pm
+++ b/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 version; # ensure we always have version.pm
use Carp; use Carp;
use File::Path; use File::Path;
-my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1 stone -my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1 stone
-eval { ExtUtils::MakeMaker::Locale::reinit('UTF-8') } -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 +my $CAN_DECODE = eval { require Encode::Locale; }; # 2 birds, 1 stone
+eval { Encode::Locale::reinit('UTF-8') } +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 $Verbose = 0; # exported
our @Parent; # needs to be localized
-- --
1.9.3 1.9.3

View File

@ -1,7 +1,7 @@
%global cpan_name ExtUtils-MakeMaker %global cpan_name ExtUtils-MakeMaker
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: 7.18 Version: 7.22
Release: 1%{?dist} Release: 1%{?dist}
Summary: Create a module Makefile Summary: Create a module Makefile
License: GPL+ or Artistic License: GPL+ or Artistic
@ -16,7 +16,7 @@ Patch1: %{cpan_name}-7.12-Link-to-libperl-explicitly-on-Linux.patch
# Unbundle version modules # Unbundle version modules
Patch2: %{cpan_name}-7.04-Unbundle-version.patch Patch2: %{cpan_name}-7.04-Unbundle-version.patch
# Unbundle Encode::Locale module # 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 # Provide maybe_command independently, bug #1129443
Patch4: %{cpan_name}-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch Patch4: %{cpan_name}-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch
BuildArch: noarch BuildArch: noarch
@ -208,6 +208,9 @@ make test
%{_mandir}/man3/ExtUtils::MM::Utils.* %{_mandir}/man3/ExtUtils::MM::Utils.*
%changelog %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 * Tue May 24 2016 Petr Pisar <ppisar@redhat.com> - 7.18-1
- 7.18 bump - 7.18 bump

View File

@ -1 +1 @@
d280b697a472b1cc8c20e96ebc9a2c7e ExtUtils-MakeMaker-7.18.tar.gz d67d345041be9e0cb391aa7f48d45b07 ExtUtils-MakeMaker-7.22.tar.gz