Define %%perl_vendor*, %%perl_archlib, %%perl_privlib, because in rpm 4.15 those are no longer defined

This commit is contained in:
Jitka Plesnikova 2019-06-12 11:18:58 +02:00
parent 43c5cd7e8e
commit 5cb5cda25d
2 changed files with 13 additions and 1 deletions

View File

@ -22,6 +22,13 @@ export PERL_AUTOINSTALL="--defaultdeps"
export PERL_MM_USE_DEFAULT=1 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 # Filtering macro incantations

View File

@ -83,7 +83,7 @@ License: GPL+ or Artistic
Epoch: %{perl_epoch} Epoch: %{perl_epoch}
Version: %{perl_version} Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise # 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 Summary: Practical Extraction and Report Language
Url: https://www.perl.org/ Url: https://www.perl.org/
Source0: https://www.cpan.org/src/5.0/perl-%{perl_version}.tar.xz 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 Summary: Macros for rpmbuild
License: GPL+ or Artistic License: GPL+ or Artistic
Requires: %perl_compat Requires: %perl_compat
Requires: perl-interpreter
%if %{defined perl_bootstrap} %if %{defined perl_bootstrap}
%gendep_perl_macros %gendep_perl_macros
%endif %endif
@ -4942,6 +4943,10 @@ popd
# Old changelog entries are preserved in CVS. # Old changelog entries are preserved in CVS.
%changelog %changelog
* Tue Jun 11 2019 Jitka Plesnikova <jplesnik@redhat.com> - 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 <jplesnik@redhat.com> - 4:5.30.0-438 * Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.30.0-438
- Perl 5.30 re-rebuild of bootstrapped packages - Perl 5.30 re-rebuild of bootstrapped packages