commit 5f8e928dcaa4a2274f0cb6021b57c264b0944e17

Author: Alexey Tourbin <at@altlinux.ru>

Date:   Wed Sep 26 01:25:38 2012 +0400

    ExtUtils/MM_Any.pm: disabled CPAN::Meta under rpm

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm

index 433a8dd..040ce3d 100644

--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm

+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm

@@ -1096,6 +1096,8 @@ CMD

     sub _has_cpan_meta {

         return $has_cpan_meta if defined $has_cpan_meta;

         return $has_cpan_meta = !!eval {

+	    die "CPAN::Meta disabled under rpm"

+		if $ENV{RPM_ARCH} && $ENV{RPM_OS} && !$ENV{PERL_CORE};

             require CPAN::Meta;

             CPAN::Meta->VERSION(2.112150);

             1;

diff --git a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t

index 8c8f801..c9b3957 100644

--- a/cpan/ExtUtils-MakeMaker/t/min_perl_version.t

+++ b/cpan/ExtUtils-MakeMaker/t/min_perl_version.t

@@ -21,7 +21,7 @@ use Test::More

 use File::Path;

 use ExtUtils::MakeMaker;

-my $CM = eval { require CPAN::Meta; };

+my $CM = eval { require CPAN::Meta; }; $CM=undef if $ENV{RPM_ARCH} && $ENV{RPM_OS};

 my $DIRNAME = 'Min-PerlVers';

 my %FILES = (

@@ -244,7 +244,7 @@ note "META.yml output"; SKIP: {

         ok(

           my $obj = eval {

             CPAN::Meta->load_file($meta_name, {lazy_validation => 0})

-          },

+          } or die "while loading $meta_name: $@",

           "$label validates"

         );

         is( $obj->prereqs->{runtime}{requires}{perl}, '5.005',

diff --git a/cpan/ExtUtils-MakeMaker/t/several_authors.t b/cpan/ExtUtils-MakeMaker/t/several_authors.t

index f1b0f1e..42351f0 100644

--- a/cpan/ExtUtils-MakeMaker/t/several_authors.t

+++ b/cpan/ExtUtils-MakeMaker/t/several_authors.t

@@ -21,7 +21,7 @@ use File::Path;

 use File::Temp qw[tempdir];

 use ExtUtils::MakeMaker;

-my $CM = eval { require CPAN::Meta; };

+my $CM = eval { require CPAN::Meta; }; $CM=undef if $ENV{RPM_ARCH} && $ENV{RPM_OS};

 my $DIRNAME = 'Multiple-Authors';

 my %FILES = (

@@ -162,7 +162,7 @@ note "META.yml output"; SKIP: {

         ok(

           my $obj = eval {

             CPAN::Meta->load_file($meta_name, {lazy_validation => 0})

-          },

+          } or die "while loading $meta_name: $@",

           "$label validates"

         );

         is_deeply( [ $obj->authors ],