commit f70ea666c70123f1b5a022edf3c0fce0dc4e91f2
Author: Petr Šabata <contyk@xxxxxxxxxx>
Date: Wed Nov 26 18:01:45 2014 +0100
Revert "0.67 bump"
Required EU::MM 7.
This reverts commit 89a2cf7fad25186528e9d022f265697f43798c5c.
.gitignore | 1 -
Inline-C-0.64-perl-in-space.patch | 70 +++++++++++++++++++++++++++++++++++++
perl-Inline-C.spec | 45 ++++++++++--------------
sources | 2 +-
4 files changed, 90 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ffa27b..c1437e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
/Inline-C-0.60.fedora.tar.gz
/Inline-C-0.62.fedora.tar.gz
/Inline-C-0.64.tar.gz
-/Inline-C-0.67.tar.gz
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 f2a645e..ccb0448 100644
--- a/perl-Inline-C.spec
+++ b/perl-Inline-C.spec
@@ -1,53 +1,49 @@
Name: perl-Inline-C
-Version: 0.67
-Release: 1%{?dist}
+Version: 0.64
+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
-# Build
BuildRequires: perl
-BuildRequires: perl(ExtUtils::MakeMaker) >= 7.00
-BuildRequires: perl(File::ShareDir::Install)
-BuildRequires: perl(strict)
-BuildRequires: perl(warnings)
-# Runtime
+BuildRequires: perl(autodie)
+BuildRequires: perl(base)
BuildRequires: perl(Carp)
BuildRequires: perl(Config)
BuildRequires: perl(constant)
BuildRequires: perl(Cwd)
BuildRequires: perl(Data::Dumper)
-BuildRequires: perl(Fcntl)
-BuildRequires: perl(File::Spec)
-BuildRequires: perl(FindBin)
-BuildRequires: perl(Inline) >= 0.58
-BuildRequires: perl(Parse::RecDescent)
-BuildRequires: perl(Time::HiRes)
-# Tests only
-BuildRequires: perl(autodie)
-BuildRequires: perl(base)
BuildRequires: perl(diagnostics)
BuildRequires: perl(Exporter)
+BuildRequires: perl(ExtUtils::MakeMaker) >= 7.00
+BuildRequires: perl(Fcntl)
BuildRequires: perl(File::Copy::Recursive)
BuildRequires: perl(File::Find)
-BuildRequires: perl(File::Path)
+BuildRequires: perl(File::ShareDir::Install)
+BuildRequires: perl(File::Spec)
+BuildRequires: perl(FindBin)
+BuildRequires: perl(Inline) >= 0.58
# Inline::Filters and Inline::Struct are optional and introduce circular deps
BuildRequires: perl(IO::All)
BuildRequires: perl(IPC::Cmd)
BuildRequires: perl(lib)
+BuildRequires: perl(Parse::RecDescent)
BuildRequires: perl(Pegex::Base)
BuildRequires: perl(Pegex::Parser)
+BuildRequires: perl(strict)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Warn)
+BuildRequires: perl(Time::HiRes)
BuildRequires: perl(version)
+BuildRequires: perl(warnings)
BuildRequires: perl(YAML::XS)
-Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
Requires: perl(FindBin)
Requires: perl(Inline) >= 0.58
-Requires: perl(Parse::RecDescent)
-Requires: perl(Time::HiRes)
+Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
# Split from Inline in 0.58
Conflicts: perl-Inline < 0.58
@@ -58,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,16 +68,12 @@ make pure_install DESTDIR=%{buildroot}
make test
%files
-%license LICENSE
-%doc Changes README
+%doc Changes CONTRIBUTING LICENSE README
%{perl_vendorlib}/auto/*
%{perl_vendorlib}/Inline/*
%{_mandir}/man3/*
%changelog
-* Wed Nov 26 2014 Petr Šabata <contyk@xxxxxxxxxx> - 0.67-1
-- 0.67 bump
-
* Wed Nov 05 2014 Petr Šabata <contyk@xxxxxxxxxx> - 0.64-2
- Backport "PERL IN SPACE" changes from ETJ's 0.65,
fixing FTBFS with EE::UU 7.00 (#1158390)
diff --git a/sources b/sources
index 8248cbc..4957c62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b60dbb3aef58146023c7121ced8f6d24 Inline-C-0.67.tar.gz
+da6acfa2dea9a38371701bbb68178544 Inline-C-0.64.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
