Compare commits

..

No commits in common. "c8-beta-stream-5.24" and "c8-stream-5.3" have entirely different histories.

2 changed files with 143 additions and 14 deletions

View File

@ -0,0 +1,116 @@
From 2c6f580d94d78b0a8e120ba86858ffcb003b08eb Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 24 May 2018 09:38:04 +0200
Subject: [PATCH] Upgrade to 5.73
---
lib/Exporter.pm | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/Exporter.pm b/lib/Exporter.pm
index 0b3db21..0e8775d 100644
--- a/lib/Exporter.pm
+++ b/lib/Exporter.pm
@@ -9,7 +9,7 @@ require 5.006;
our $Debug = 0;
our $ExportLevel = 0;
our $Verbose ||= 0;
-our $VERSION = '5.72';
+our $VERSION = '5.73';
our (%Cache);
sub as_heavy {
@@ -106,14 +106,14 @@ In module F<YourModule.pm>:
package YourModule;
require Exporter;
- @ISA = qw(Exporter);
- @EXPORT_OK = qw(munge frobnicate); # symbols to export on request
+ our @ISA = qw(Exporter);
+ our @EXPORT_OK = qw(munge frobnicate); # symbols to export on request
or
package YourModule;
use Exporter 'import'; # gives you Exporter's import() method directly
- @EXPORT_OK = qw(munge frobnicate); # symbols to export on request
+ our @EXPORT_OK = qw(munge frobnicate); # symbols to export on request
In other files which wish to use C<YourModule>:
@@ -146,8 +146,8 @@ symbols can represent functions, scalars, arrays, hashes, or typeglobs.
The symbols must be given by full name with the exception that the
ampersand in front of a function is optional, e.g.
- @EXPORT = qw(afunc $scalar @array); # afunc is a function
- @EXPORT_OK = qw(&bfunc %hash *typeglob); # explicit prefix on &bfunc
+ our @EXPORT = qw(afunc $scalar @array); # afunc is a function
+ our @EXPORT_OK = qw(&bfunc %hash *typeglob); # explicit prefix on &bfunc
If you are only exporting function names it is recommended to omit the
ampersand, as the implementation is faster this way.
@@ -234,9 +234,9 @@ include :DEFAULT explicitly.
e.g., F<Module.pm> defines:
- @EXPORT = qw(A1 A2 A3 A4 A5);
- @EXPORT_OK = qw(B1 B2 B3 B4 B5);
- %EXPORT_TAGS = (T1 => [qw(A1 A2 B1 B2)], T2 => [qw(A1 A2 B3 B4)]);
+ our @EXPORT = qw(A1 A2 A3 A4 A5);
+ our @EXPORT_OK = qw(B1 B2 B3 B4 B5);
+ our %EXPORT_TAGS = (T1 => [qw(A1 A2 B1 B2)], T2 => [qw(A1 A2 B3 B4)]);
Note that you cannot use tags in @EXPORT or @EXPORT_OK.
@@ -279,8 +279,8 @@ import function:
package A;
- @ISA = qw(Exporter);
- @EXPORT_OK = qw($b);
+ our @ISA = qw(Exporter);
+ our @EXPORT_OK = qw($b);
sub import
{
@@ -293,8 +293,8 @@ inheritance, as it stands Exporter::import() will never get called.
Instead, say the following:
package A;
- @ISA = qw(Exporter);
- @EXPORT_OK = qw($b);
+ our @ISA = qw(Exporter);
+ our @EXPORT_OK = qw($b);
sub import
{
@@ -374,7 +374,7 @@ Since the symbols listed within C<%EXPORT_TAGS> must also appear in either
C<@EXPORT> or C<@EXPORT_OK>, two utility functions are provided which allow
you to easily add tagged sets of symbols to C<@EXPORT> or C<@EXPORT_OK>:
- %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
+ our %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
Exporter::export_tags('foo'); # add aa, bb and cc to @EXPORT
Exporter::export_ok_tags('bar'); # add aa, cc and dd to @EXPORT_OK
@@ -391,7 +391,7 @@ useful to create the utility ":all" to simplify "use" statements.
The simplest way to do this is:
- %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
+ our %EXPORT_TAGS = (foo => [qw(aa bb cc)], bar => [qw(aa cc dd)]);
# add all the other ":class" tags to the ":all" class,
# deleting duplicates
@@ -460,7 +460,7 @@ variables C<@EXPORT_OK>, C<@EXPORT>, C<@ISA>, etc.
our @ISA = qw(Exporter);
our @EXPORT_OK = qw(munge frobnicate);
-If backward compatibility for Perls under 5.6 is important,
+If backward compatibility for Perls B<under> 5.6 is important,
one must write instead a C<use vars> statement.
use vars qw(@ISA @EXPORT_OK);
--
2.14.3

View File

@ -7,15 +7,16 @@
%global base_version 5.70
Name: perl-Exporter
Version: 5.72
Release: 1001%{?dist}
Version: 5.73
Release: 440%{?dist}
Summary: Implements default import method for modules
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Exporter/
Source0: http://www.cpan.org/authors/id/T/TO/TODDR/Exporter-%{base_version}.tar.gz
URL: https://metacpan.org/release/Exporter
Source0: https://cpan.metacpan.org/authors/id/T/TO/TODDR/Exporter-%{base_version}.tar.gz
# Unbundled from perl 5.21.11
Patch0: Exporter-5.70-Upgrade-to-5.72.patch
# Unbundled from perl 5.28.0-RC1
Patch1: Exporter-5.72-Upgrade-to-5.73.patch
BuildArch: noarch
BuildRequires: perl-interpreter
BuildRequires: perl-generators
@ -45,6 +46,7 @@ the common case.
%prep
%setup -q -n Exporter-%{base_version}
%patch0 -p1
%patch1 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor
@ -64,18 +66,29 @@ make test
%{_mandir}/man3/*
%changelog
* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 5.72-1001
- Rebuild with enable hardening (bug #1636329)
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.73-440
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Aug 23 2018 Petr Pisar <ppisar@redhat.com> - 5.72-1000
- Increase release not to clash with perl-bootstrap:5.24 subpackages
(bug #1620192)
* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 5.73-439
- Perl 5.30 re-rebuild of bootstrapped packages
* Fri Apr 27 2018 Petr Pisar <ppisar@redhat.com> - 5.72-398
- Increase release not to clash with perl-bootstrap:5.24 subpackages
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 5.73-438
- Increase release to favour standalone package
* Wed Mar 28 2018 Petr Pisar <ppisar@redhat.com> - 5.72-397
- Increase release not to clash with perl-bootstrap:5.24 subpackages
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.73-419
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.73-418
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat Jun 30 2018 Jitka Plesnikova <jplesnik@redhat.com> - 5.73-417
- Perl 5.28 re-rebuild of bootstrapped packages
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 5.73-416
- Increase release to favour standalone package
* Thu May 24 2018 Jitka Plesnikova <jplesnik@redhat.com> - 5.73-1
- Upgrade to 5.73 as provided in perl-5.28.0-RC1
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.72-396
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild