From 5cb5cda25d0ae05d3c88c2f39ff262c021bd5647 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2019 11:18:58 +0200 Subject: [PATCH] Define %%perl_vendor*, %%perl_archlib, %%perl_privlib, because in rpm 4.15 those are no longer defined --- macros.perl | 7 +++++++ perl.spec | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/macros.perl b/macros.perl index 9c1fd0c..9de4eff 100644 --- a/macros.perl +++ b/macros.perl @@ -22,6 +22,13 @@ export PERL_AUTOINSTALL="--defaultdeps" export PERL_MM_USE_DEFAULT=1 } +############################################################################# +# Perl specific macros, no longer part of rpm >= 4.15 +%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) +%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) +%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) +%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) + ############################################################################# # Filtering macro incantations diff --git a/perl.spec b/perl.spec index 8c6c848..6589ccd 100644 --- a/perl.spec +++ b/perl.spec @@ -83,7 +83,7 @@ License: GPL+ or Artistic Epoch: %{perl_epoch} Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 438%{?dist} +Release: 439%{?dist} Summary: Practical Extraction and Report Language Url: https://www.perl.org/ Source0: https://www.cpan.org/src/5.0/perl-%{perl_version}.tar.xz @@ -421,6 +421,7 @@ Most perl packages will need to install perl-devel to build. Summary: Macros for rpmbuild License: GPL+ or Artistic Requires: %perl_compat +Requires: perl-interpreter %if %{defined perl_bootstrap} %gendep_perl_macros %endif @@ -4942,6 +4943,10 @@ popd # Old changelog entries are preserved in CVS. %changelog +* Tue Jun 11 2019 Jitka Plesnikova - 4:5.30.0-439 +- Define %%perl_vendor*, %%perl_archlib, %%perl_privlib, because in rpm + 4.15 those are no longer defined + * Sun Jun 02 2019 Jitka Plesnikova - 4:5.30.0-438 - Perl 5.30 re-rebuild of bootstrapped packages