From 468baec42e42583954f07d8c2ff63a443bb3245c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= <[email protected]> Date: Tue, 30 May 2017 09:56:57 +0200 Subject: Include a Module::Build::Tiny compatibility fix, ghpr#5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Šabata <[email protected]> --- ...d-arguments-for-Build.PL-spec-conformance.patch | 32 ++++++++++++++++++++++ cpanspec.spec | 10 +++++-- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 cpanspec-1.78-Fix-build-arguments-for-Build.PL-spec-conformance.patch diff --git a/cpanspec-1.78-Fix-build-arguments-for-Build.PL-spec-conformance.patch b/cpanspec-1.78-Fix-build-arguments-for-Build.PL-spec-conformance.patch new file mode 100644 index 0000000..93a80e7 --- /dev/null +++ b/cpanspec-1.78-Fix-build-arguments-for-Build.PL-spec-conformance.patch @@ -0,0 +1,32 @@ +From ce89117d8dc4ad7ef66b7f6e2b8579cefbd51643 Mon Sep 17 00:00:00 2001 +From: Leon Timmermans <[email protected]> +Date: Mon, 20 May 2013 15:08:38 +0200 +Subject: [PATCH] Fix build arguments for Build.PL spec conformance + +This makes it compatible with tools such as Module::Build::Tiny +--- + cpanspec | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cpanspec b/cpanspec +index 2f8377e..d972d1c 100755 +--- a/cpanspec ++++ b/cpanspec +@@ -1214,7 +1214,7 @@ END + + if ($usebuildpl) { + print $spec <<END; +-\%{__perl} Build.PL installdirs=vendor@{[$noarch ? '' : qq{ optimize="$macro{optimize}"} ]} ++\%{__perl} Build.PL --installdirs=vendor@{[$noarch ? '' : qq{ --optimize="$macro{optimize}"} ]} + ./Build + END + } else { +@@ -1240,7 +1240,7 @@ END + + if ($usebuildpl) { + print $spec +- "./Build install destdir=$macro{buildroot} create_packlist=0\n"; ++ "./Build install --destdir=$macro{buildroot} --create_packlist=0\n"; + } else { + print $spec <<END; + make pure_install PERL_INSTALL_ROOT=$macro{buildroot} diff --git a/cpanspec.spec b/cpanspec.spec index 6c563da..3c23c8b 100644 --- a/cpanspec.spec +++ b/cpanspec.spec @@ -1,6 +1,6 @@ Name: cpanspec Version: 1.78 -Release: 26%{?dist} +Release: 27%{?dist} Summary: RPM spec file generation utility License: GPL+ or Artistic Group: Development/Tools @@ -10,8 +10,8 @@ Patch0: %{name}-1.78-Change-optimize-to-optflags.patch Patch1: %{name}-1.78-Strip-any-version-comparison-operator-from-the-perl-BR.patch Patch2: %{name}-1.78-Escape-slashes-in-filters.patch Patch3: %{name}-1.78-Prefer-dnf-over-repoquery.patch +Patch4: %{name}-1.78-Fix-build-arguments-for-Build.PL-spec-conformance.patch BuildArch: noarch -BuildRequires: coreutils BuildRequires: findutils BuildRequires: perl BuildRequires: perl-generators @@ -35,6 +35,7 @@ contained in the spec file is correct. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build perl Build.PL installdirs=vendor @@ -42,7 +43,7 @@ perl Build.PL installdirs=vendor %install ./Build install destdir=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} + +find %{buildroot} -type f -name .packlist -delete %{_fixperms} %{buildroot}/* %files @@ -53,6 +54,9 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} + %{_mandir}/man1/* %changelog +* Tue May 30 2017 Petr Šabata <[email protected]> - 1.78-27 +- Include a Module::Build::Tiny compatibility fix, ghpr#5 + * Fri Feb 10 2017 Fedora Release Engineering <[email protected]> - 1.78-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -- cgit v1.1 https://src.fedoraproject.org/cgit/cpanspec.git/commit/?h=f26&id=468baec42e42583954f07d8c2ff63a443bb3245c _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
