[packages/perl-rpm-build-perl] - added Adapt-tests-to-Perl-5.35.12.patch patch from Fedora (fixes build with perl 5.36)
qboosh
qboosh at pld-linux.org
Fri Feb 3 19:22:13 CET 2023
commit 7022c9a21e2ac2310e2f6b003ce7e64cb835fef3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Feb 3 19:23:39 2023 +0100
- added Adapt-tests-to-Perl-5.35.12.patch patch from Fedora (fixes build with perl 5.36)
perl-rpm-build-perl.spec | 10 ++++--
rpm-build-perl-Adapt-tests-to-Perl-5.35.12.patch | 39 ++++++++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/perl-rpm-build-perl.spec b/perl-rpm-build-perl.spec
index af02981..06c1ddd 100644
--- a/perl-rpm-build-perl.spec
+++ b/perl-rpm-build-perl.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without tests # do not perform "make test"
+%bcond_without tests # unit tests
#
%define pdir rpm
%define pnam build-perl
@@ -11,14 +11,17 @@ Version: 0.82
Release: 10
License: GPL v2+
Group: Development/Languages/Perl
-Source0: http://www.cpan.org/modules/by-authors/id/A/AT/ATOURBIN/%{pdir}-%{pnam}-%{version}.tar.gz
+Source0: https://www.cpan.org/modules/by-authors/id/A/AT/ATOURBIN/%{pdir}-%{pnam}-%{version}.tar.gz
# Source0-md5: 1cfb4f6a0842d04ef39fd945abacce91
# https://rt.cpan.org/Ticket/Attachment/1513584/807128/rpm-build-perl-0.82-Adjust-to-perl-5.22.patch
Patch0: %{name}-perl5.22.patch
# https://rt.cpan.org/Ticket/Attachment/1213691/640915/0001-Fix-non-deterministic-failures-on-newer-perls.patch
Patch1: %{name}-non-deterministic-failures.patch
+# CPAN RT#117350
Patch2: rpm-build-perl-0.82-Port-to-OpSIBLING-like-macros-required-since-Perl-5..patch
-URL: http://search.cpan.org/dist/rpm-build-perl/
+# CPAN RT#142772
+Patch3: rpm-build-perl-Adapt-tests-to-Perl-5.35.12.patch
+URL: https://metacpan.org/dist/rpm-build-perl
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.745
@@ -39,6 +42,7 @@ Moduł ten znajduje zależności dla źródeł perlowych.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__perl} Makefile.PL \
diff --git a/rpm-build-perl-Adapt-tests-to-Perl-5.35.12.patch b/rpm-build-perl-Adapt-tests-to-Perl-5.35.12.patch
new file mode 100644
index 0000000..f6cab59
--- /dev/null
+++ b/rpm-build-perl-Adapt-tests-to-Perl-5.35.12.patch
@@ -0,0 +1,39 @@
+From 4e4b1a4723c4b89d94c0d78098108332ccd04a35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 16 May 2022 14:37:33 +0200
+Subject: [PATCH] Adapt tests to Perl 5.35.12
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Perl 5.35.12 has POSIX module in version 2.03. That version number was
+not expected by t/03-perlprov.t test:
+
+ # Failed test 'POSIX.pm dependencies'
+ # at t/03-perlprov.t line 32.
+ # 'perl(POSIX.pm) = 2.030'
+ # doesn't match '(?^:^perl\(POSIX\.pm\)\ \=\ 1\.(\d|$))'
+
+This patch adapts the test to accept any version number.
+
+CPAN RT#142772
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ t/03-perlprov.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/03-perlprov.t b/t/03-perlprov.t
+index b3472d1..ccde76a 100644
+--- a/t/03-perlprov.t
++++ b/t/03-perlprov.t
+@@ -50,5 +50,5 @@ Provides "Data/Dumper.pm" => "perl(Data/Dumper.pm) = 2.";
+ Provides "IO/File.pm" => "perl(IO/File.pm) = 1.";
+ Provides "File/Glob.pm" => "perl(File/Glob.pm) = ";
+ Provides "Socket.pm" => "perl(Socket.pm) = ";
+-Provides "POSIX.pm" => "perl(POSIX.pm) = 1.";
++Provides "POSIX.pm" => "perl(POSIX.pm) = ";
+
+--
+2.35.3
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl-rpm-build-perl.git/commitdiff/7022c9a21e2ac2310e2f6b003ce7e64cb835fef3
More information about the pld-cvs-commit
mailing list