diff --git a/Exporter-5.70-Upgrade-to-5.72.patch b/Exporter-5.70-Upgrade-to-5.72.patch deleted file mode 100644 index e19a074..0000000 --- a/Exporter-5.70-Upgrade-to-5.72.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6e7210f1ad3f709f846a812ab7db6543af90c477 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 6 May 2015 12:35:17 +0200 -Subject: [PATCH] Upgrade to 5.72 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - lib/Exporter.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/Exporter.pm b/lib/Exporter.pm -index 4930505..0b3db21 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.70'; -+our $VERSION = '5.72'; - our (%Cache); - - sub as_heavy { -@@ -223,7 +223,7 @@ right. Specifications are in the form: - - [!]name This name only - [!]:DEFAULT All names in @EXPORT -- [!]:tag All names in $EXPORT_TAGS{tag} anonymous list -+ [!]:tag All names in $EXPORT_TAGS{tag} anonymous array - [!]/pattern/ All names in @EXPORT and @EXPORT_OK which match - - A leading ! indicates that matching names should be deleted from the --- -2.1.0 - diff --git a/Exporter-5.70.tar.gz b/Exporter-5.70.tar.gz deleted file mode 100644 index 19b971d..0000000 Binary files a/Exporter-5.70.tar.gz and /dev/null differ diff --git a/Exporter-5.72-Upgrade-to-5.73.patch b/Exporter-5.72-Upgrade-to-5.73.patch deleted file mode 100644 index 4f9655b..0000000 --- a/Exporter-5.72-Upgrade-to-5.73.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 2c6f580d94d78b0a8e120ba86858ffcb003b08eb Mon Sep 17 00:00:00 2001 -From: Jitka Plesnikova -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: - - 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: - -@@ -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 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 5.6 is important, - one must write instead a C statement. - - use vars qw(@ISA @EXPORT_OK); --- -2.14.3 - diff --git a/Exporter-5.73.tar.gz b/Exporter-5.73.tar.gz new file mode 100644 index 0000000..d342286 Binary files /dev/null and b/Exporter-5.73.tar.gz differ diff --git a/perl-Exporter.spec b/perl-Exporter.spec index 83ad8fd..a968d04 100644 --- a/perl-Exporter.spec +++ b/perl-Exporter.spec @@ -1,13 +1,10 @@ Name: perl-Exporter Version: 5.73 -Release: 419 +Release: 420 Summary: Implements default import method for modules License: GPL+ or Artistic URL: https://metacpan.org/release/Exporter -Source0: https://cpan.metacpan.org/authors/id/T/TO/TODDR/Exporter-5.70.tar.gz - -Patch0: Exporter-5.70-Upgrade-to-5.72.patch -Patch1: Exporter-5.72-Upgrade-to-5.73.patch +Source0: https://cpan.metacpan.org/authors/id/T/TO/TODDR/Exporter-%{version}.tar.gz BuildArch: noarch BuildRequires: perl-interpreter perl-generators git @@ -34,7 +31,7 @@ Requires: man Man pages and other related documents for %{name}. %prep -%autosetup -n Exporter-5.70 -p1 -S git +%autosetup -n Exporter-%{version} -p1 -S git %build perl Makefile.PL INSTALLDIRS=vendor @@ -56,5 +53,11 @@ make test %{_mandir}/man3/* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 5.73-420 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: update the package with tarball + * Sat Sep 14 2019 guiyao - 5.73-419 - Package Init