!3 Adapt to changes in perl-Moo update to 2.005004

From: @starlet-dx 
Reviewed-by: @licihua 
Signed-off-by: @licihua
This commit is contained in:
openeuler-ci-bot 2022-06-16 11:59:17 +00:00 committed by Gitee
commit 562c5414f0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 49 additions and 3 deletions

View File

@ -0,0 +1,42 @@
From 18e36d68c1c7b6db2a4fe51482e2f46107e764c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 21 Apr 2020 08:01:21 +0200
Subject: [PATCH] Adapt to changes in Moo 2.004000
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Moo-2.004000 refactored "creation and installation of helper subs" and
as a result a direct Moo::import execution stopped working and
Module-Manifest-Skip tests either:
t/create.t .............. Can't locate object method "_install_subs" via package "Module::Manifest::Skip" at /usr/share/perl5/vendor_perl/Moo.pm line 47.
BEGIN failed--compilation aborted at t/TestModuleManifestSkip.pm line 6.
Compilation failed in require at t/create.t line 3.
Because Moo::import() is already executed when Module::Manifest::Skip does "use
Moo;", the simplest fix is to stop calling it again.
https://github.com/ingydotnet/module-manifest-skip-pm/issues/7
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/Module/Manifest/Skip.pm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/Module/Manifest/Skip.pm b/lib/Module/Manifest/Skip.pm
index 434f7ce..27c1ac7 100644
--- a/lib/Module/Manifest/Skip.pm
+++ b/lib/Module/Manifest/Skip.pm
@@ -28,9 +28,6 @@ sub import {
close MS;
exit;
}
- else {
- goto &Moo::import;
- }
}
sub add {
--
2.21.2

View File

@ -1,11 +1,12 @@
Name: perl-Module-Manifest-Skip Name: perl-Module-Manifest-Skip
Version: 0.23 Version: 0.23
Release: 16 Release: 17
Summary: MANIFEST.SKIP Manangement for Modules Summary: MANIFEST.SKIP Manangement for Modules
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/Module-Manifest-Skip URL: https://metacpan.org/release/Module-Manifest-Skip
Source0: https://cpan.metacpan.org/authors/id/I/IN/INGY/Module-Manifest-Skip-%{version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/I/IN/INGY/Module-Manifest-Skip-%{version}.tar.gz
Patch0: Module-Manifest-Skip-0.23-Adapt-to-changes-in-Moo-2.004000.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: perl-interpreter perl-generators perl(ExtUtils::MakeMaker) >= 6.30 BuildRequires: perl-interpreter perl-generators perl(ExtUtils::MakeMaker) >= 6.30
@ -32,7 +33,7 @@ although this is rarely needed.
%package_help %package_help
%prep %prep
%autosetup -n Module-Manifest-Skip-%{version} %autosetup -n Module-Manifest-Skip-%{version} -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor
@ -58,5 +59,8 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Wed Jun 15 2022 yaoxin <yaoxin30@h-partners.com> - 0.23-17
- Adapt to changes in perl-Moo update to 2.005004
* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.23-16 * Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.23-16
- Package init - Package init