[perl-Inline-C] Backport "PERL IN SPACE" changes from ETJ's 0.65

[Petr Šabata]

commit e462ba4e9f4b0b5c23bb642e08493c91d3eed388
Author: Petr Šabata <contyk at redhat.com>
Date:   Wed Nov 5 15:52:59 2014 +0100

    Backport "PERL IN SPACE" changes from ETJ's 0.65
    
    Fixing FTBFS with EE::UU 7.00 (#1158390).

 Inline-C-0.64-perl-in-space.patch |   70 +++++++++++++++++++++++++++++++++++++
 perl-Inline-C.spec                |   11 +++++-
 2 files changed, 79 insertions(+), 2 deletions(-)
---
diff --git a/Inline-C-0.64-perl-in-space.patch b/Inline-C-0.64-perl-in-space.patch
new file mode 100644
index 0000000..1a8e830
--- /dev/null
+++ b/Inline-C-0.64-perl-in-space.patch
@@ -0,0 +1,70 @@
+diff --git a/lib/Inline/C.pm b/lib/Inline/C.pm
+index 51c8a2a..edbdc5e 100644
+--- a/lib/Inline/C.pm
++++ b/lib/Inline/C.pm
+@@ -777,7 +777,6 @@ sub write_Makefile_PL {
+     my $i = 0;
+     for (@{$o->{ILSM}{MAKEFILE}{TYPEMAPS}}) {
+         $o->{ILSM}{xsubppargs} .= "-typemap \"$_\" ";
+-        $o->{ILSM}{MAKEFILE}{TYPEMAPS}->[$i++] = fix_space($_);
+     }
+ 
+     my %options = (
+@@ -956,7 +955,6 @@ sub fix_make {
+             $fix = $fixes{$1}
+         ) {
+             my $fixed = $o->{ILSM}{$fix};
+-            $fixed = fix_space($fixed) if $fix eq 'install_lib';
+             print MAKEFILE "$1 = $fixed\n";
+         }
+         else {
+@@ -1037,11 +1035,6 @@ sub quote_space {
+     $_[0] = $out;
+ }
+ 
+-sub fix_space {
+-    $_[0] =~ s/ /\\ /g if $_[0] =~ / /;
+-    $_[0];
+-}
+-
+ #==============================================================================
+ # This routine used by C/t/09parser to test that the expected parser is in use
+ #==============================================================================
+diff --git a/t/27inline_maker.t b/t/27inline_maker.t
+index 5c41caa..48d5aa6 100644
+--- a/t/27inline_maker.t
++++ b/t/27inline_maker.t
+@@ -10,6 +10,10 @@ use Cwd;
+ use File::Copy::Recursive qw(rcopy);
+ use autodie;
+ 
++my @make_targets = qw(test install);
++my $CLEANUP = 1;
++push @make_targets, qw(realclean) if $CLEANUP;
++
+ my ($example_modules_dir) = grep { -e } map {
+   File::Spec->rel2abs(File::Spec->catdir($_, 'modules'))
+ } qw(eg example);
+@@ -23,7 +27,7 @@ plan skip_all => "Inline version 0.64+ required for this."
+ my $lib_dir = File::Spec->rel2abs('lib');
+ my $base_dir = File::Spec->rel2abs($TestInlineSetup::DIR);
+ my $src_dir = File::Spec->catdir($base_dir, 'src dir');
+-my $inst_dir = File::Spec->catdir($base_dir, 'instdir');
++my $inst_dir = File::Spec->catdir($base_dir, 'inst dir');
+ mkpath $inst_dir;
+ 
+ my $cwd = getcwd;
+@@ -35,10 +39,10 @@ for my $module (glob "$example_modules_dir/*") {
+   my $cmd = [$^X, "-I$lib_dir", 'Makefile.PL', "INSTALL_BASE=$inst_dir"];
+   my @result = run(command => $cmd, verbose => 0, buffer => \$buffer);
+   ok($result[0], "$module Makefile creation");
+-  diag $buffer unless $result[0];
+-  map { do_make($_) } qw(test install realclean);
++  diag "Error: $result[1]\n", $buffer unless $result[0];
++  map { do_make($_) } @make_targets;
+   chdir $cwd;
+-  rmtree $src_dir;
++  rmtree $src_dir if $CLEANUP;
+ }
+ 
+ sub do_make {
diff --git a/perl-Inline-C.spec b/perl-Inline-C.spec
index 6fb31eb..ccb0448 100644
--- a/perl-Inline-C.spec
+++ b/perl-Inline-C.spec
@@ -1,11 +1,13 @@
 Name:           perl-Inline-C
 Version:        0.64
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Write Perl subroutines in C
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Inline-C/
 Source0:        http://search.cpan.org/CPAN/authors/id/I/IN/INGY/Inline-C-%{version}.tar.gz
+# From ETJ's 0.65
+Patch0:         Inline-C-0.64-perl-in-space.patch
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(autodie)
@@ -17,7 +19,7 @@ BuildRequires:  perl(Cwd)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(diagnostics)
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 7.00
 BuildRequires:  perl(Fcntl)
 BuildRequires:  perl(File::Copy::Recursive)
 BuildRequires:  perl(File::Find)
@@ -52,6 +54,7 @@ each language has its own support module.
 
 %prep
 %setup -q -n Inline-C-%{version}
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
@@ -71,6 +74,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 05 2014 Petr Šabata <contyk at redhat.com> - 0.64-2
+- Backport "PERL IN SPACE" changes from ETJ's 0.65,
+  fixing FTBFS with EE::UU 7.00 (#1158390)
+
 * Mon Sep 29 2014 Petr Šabata <contyk at redhat.com> - 0.64-1
 - 0.64 bump, include Cookbook.pod again