Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
6
.gitignore
vendored
6
.gitignore
vendored
@ -1 +1,5 @@
|
||||
SOURCES/Module-Manifest-Skip-0.23.tar.gz
|
||||
/Module-Manifest-Skip-0.16.tar.gz
|
||||
/Module-Manifest-Skip-0.17.tar.gz
|
||||
/Module-Manifest-Skip-0.19.tar.gz
|
||||
/Module-Manifest-Skip-0.20.tar.gz
|
||||
/Module-Manifest-Skip-0.23.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
d738d335dfb534a13b3eac62b6044f2edb8752cf SOURCES/Module-Manifest-Skip-0.23.tar.gz
|
||||
@ -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
|
||||
|
||||
@ -1,15 +1,19 @@
|
||||
Name: perl-Module-Manifest-Skip
|
||||
Version: 0.23
|
||||
Release: 10%{?dist}
|
||||
Release: 22%{?dist}
|
||||
Summary: MANIFEST.SKIP Manangement for Modules
|
||||
License: GPL+ or Artistic
|
||||
Group: Development/Libraries
|
||||
URL: http://search.cpan.org/dist/Module-Manifest-Skip/
|
||||
Source0: http://www.cpan.org/authors/id/I/IN/INGY/Module-Manifest-Skip-%{version}.tar.gz
|
||||
URL: https://metacpan.org/release/Module-Manifest-Skip
|
||||
Source0: https://cpan.metacpan.org/authors/id/I/IN/INGY/Module-Manifest-Skip-%{version}.tar.gz
|
||||
# Adapt to changes in Moo-2.004000, bug #1826148,
|
||||
# <https://github.com/ingydotnet/module-manifest-skip-pm/issues/7>
|
||||
Patch0: Module-Manifest-Skip-0.23-Adapt-to-changes-in-Moo-2.004000.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: make
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: perl(:VERSION) >= 5.8.1
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
|
||||
BuildRequires: perl(File::ShareDir::Install) >= 0.06
|
||||
BuildRequires: perl(strict)
|
||||
BuildRequires: perl(warnings)
|
||||
@ -45,25 +49,64 @@ possible.
|
||||
|
||||
%prep
|
||||
%setup -q -n Module-Manifest-Skip-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags}
|
||||
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
|
||||
%{make_build}
|
||||
|
||||
%install
|
||||
make pure_install DESTDIR=$RPM_BUILD_ROOT
|
||||
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
|
||||
%{make_install}
|
||||
%{_fixperms} $RPM_BUILD_ROOT/*
|
||||
|
||||
%check
|
||||
unset RELEASE_TESTING
|
||||
make test
|
||||
|
||||
%files
|
||||
%doc Changes CONTRIBUTING LICENSE README
|
||||
%license LICENSE
|
||||
%doc Changes CONTRIBUTING README
|
||||
%{perl_vendorlib}/*
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.23-22
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.23-21
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.23-18
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Tue Apr 21 2020 Petr Pisar <ppisar@redhat.com> - 0.23-17
|
||||
- Adapt to changes in Moo-2.004000 (bug #1826148)
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.23-14
|
||||
- Perl 5.30 rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.23-11
|
||||
- Perl 5.28 rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
Loading…
Reference in New Issue
Block a user