Remove invalid macro definitions from macros.perl

From: Panu Matilainen <pmatilai@redhat.com>

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.
This commit is contained in:
Petr Písař 2018-01-09 11:49:53 +01:00
parent 927bf01f13
commit fca4148414
2 changed files with 4 additions and 5 deletions

View File

@ -30,10 +30,6 @@ export PERL_MM_USE_DEFAULT=1
%perl_default_filter_revision 3 %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 # By default, for perl packages we want to filter all files in _docdir from
# req/prov scanning. # req/prov scanning.
# Filtering out any provides caused by private libs in vendorarch/archlib # Filtering out any provides caused by private libs in vendorarch/archlib

View File

@ -79,7 +79,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: 401%{?dist} Release: 402%{?dist}
Summary: Practical Extraction and Report Language Summary: Practical Extraction and Report Language
Url: http://www.perl.org/ Url: http://www.perl.org/
Source0: http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2 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. # Old changelog entries are preserved in CVS.
%changelog %changelog
* Tue Jan 09 2018 Petr Pisar <ppisar@redhat.com> - 4:5.26.1-402
- Remove invalid macro definitions from macros.perl (bug #1532539)
* Mon Sep 25 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.26.1-401 * Mon Sep 25 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.26.1-401
- Update perl(:MODULE_COMPAT) - Update perl(:MODULE_COMPAT)