From fca4148414eb74c8ae2550a65da8fdef6838219d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 9 Jan 2018 11:49:53 +0100 Subject: [PATCH] Remove invalid macro definitions from macros.perl From: Panu Matilainen These two lines are trying to redefine macro named "global", which is obviously wrong, but additionally the thing they're *trying* to do is also wrong in rpm >= 4.9 world, so best just remove them. --- macros.perl | 4 ---- perl.spec | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/macros.perl b/macros.perl index 83d86fb..9c1fd0c 100644 --- a/macros.perl +++ b/macros.perl @@ -30,10 +30,6 @@ export PERL_MM_USE_DEFAULT=1 %perl_default_filter_revision 3 -# Perl provides/requeries are generated by external generators. -%global __perl_provides /usr/lib/rpm/perl.prov -%global __perl_requires /usr/lib/rpm/perl.req - # By default, for perl packages we want to filter all files in _docdir from # req/prov scanning. # Filtering out any provides caused by private libs in vendorarch/archlib diff --git a/perl.spec b/perl.spec index c87b25b..bab53ed 100644 --- a/perl.spec +++ b/perl.spec @@ -79,7 +79,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: 401%{?dist} +Release: 402%{?dist} Summary: Practical Extraction and Report Language Url: http://www.perl.org/ Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2 @@ -5087,6 +5087,9 @@ popd # Old changelog entries are preserved in CVS. %changelog +* Tue Jan 09 2018 Petr Pisar - 4:5.26.1-402 +- Remove invalid macro definitions from macros.perl (bug #1532539) + * Mon Sep 25 2017 Jitka Plesnikova - 4:5.26.1-401 - Update perl(:MODULE_COMPAT)