rpms/perl-ExtUtils-MakeMaker
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove new line from INC (CPAN RT#106808)

Browse Source
This commit is contained in:
Jitka Plesnikova 2015-09-01 14:47:13 +02:00
parent 9a557da02e
commit 9ac29b40bb
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ExtUtils-MakeMaker-7.06-Remove-new-line-from-INC.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm.orig ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm
--- ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm.orig 2015-09-01 13:10:14.810680431 +0200
+++ ExtUtils-MakeMaker-7.06/lib/ExtUtils/MM_Unix.pm 2015-09-01 14:03:30.587696052 +0200
@@ -2948,7 +2948,7 @@ sub pasthru {
my $val = qq{\$($key)};
# expand within perl if given since need to use quote_literal
# since INC might include space-protecting ""!
- $val = $self->{$key} if defined $self->{$key};
+ chomp($val = $self->{$key}) if defined $self->{$key};
$val .= " \$(PASTHRU_$key)";
my $quoted = $self->quote_literal($val);
push @pasthru, qq{PASTHRU_$key=$quoted};

8
perl-ExtUtils-MakeMaker.spec
View File

@ -3,7 +3,7 @@
Name: perl-%{cpan_name} Name: perl-%{cpan_name}
Version: %(echo '%{cpan_version}' | tr _ .) Version: %(echo '%{cpan_version}' | tr _ .)
Release: 1%{?dist} Release: 2%{?dist}
Summary: Create a module Makefile Summary: Create a module Makefile
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries Group: Development/Libraries
@ -18,6 +18,8 @@ Patch1: %{cpan_name}-7.06-Link-to-libperl-explicitly-on-Linux.patch
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.00-Unbundle-Encode-Locale.patch
# Remove new line from INC - CPAN RT#106808
Patch4: %{cpan_name}-7.06-Remove-new-line-from-INC.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: findutils BuildRequires: findutils
@ -141,6 +143,7 @@ easier to deal with in Makefiles.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# Remove bundled modules # Remove bundled modules
rm -rf bundled rm -rf bundled
sed -i -e '/^bundled\// d' MANIFEST sed -i -e '/^bundled\// d' MANIFEST
@ -178,6 +181,9 @@ make test
%{_mandir}/man3/ExtUtils::Command.* %{_mandir}/man3/ExtUtils::Command.*
%changelog %changelog
* Tue Sep 01 2015 Jitka Plesnikova <jplesnik@redhat.com> - 7.06-2
- Remove new line from INC (CPAN RT#106808)
* Tue Sep 01 2015 Petr Pisar <ppisar@redhat.com> - 7.06-1 * Tue Sep 01 2015 Petr Pisar <ppisar@redhat.com> - 7.06-1
- 7.06 bump - 7.06 bump
- ExtUtils::Command module is distributed by ExtUtils-MakeMaker - ExtUtils::Command module is distributed by ExtUtils-MakeMaker