From a7204f2823fdce20ee964227cdaa44bb36917d38 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 6 Dec 2024 09:43:34 +0300 Subject: [PATCH] import perl-Term-Table-0.018-513.el10 --- ...ble-0.018-Use-system-Object-HashBase.patch | 84 ------------------- SPECS/perl-Term-Table.spec | 24 ++---- 2 files changed, 7 insertions(+), 101 deletions(-) delete mode 100644 SOURCES/Term-Table-0.018-Use-system-Object-HashBase.patch diff --git a/SOURCES/Term-Table-0.018-Use-system-Object-HashBase.patch b/SOURCES/Term-Table-0.018-Use-system-Object-HashBase.patch deleted file mode 100644 index 4907e68..0000000 --- a/SOURCES/Term-Table-0.018-Use-system-Object-HashBase.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 49bf49b99a7ffb12b68035f096c160bc51e48775 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 21 Nov 2019 09:22:33 +0100 -Subject: [PATCH] Use system Object::HashBase -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - Makefile.PL | 1 + - lib/Term/Table.pm | 2 +- - lib/Term/Table/Cell.pm | 2 +- - lib/Term/Table/CellStack.pm | 2 +- - lib/Term/Table/LineBreak.pm | 2 +- - 5 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 44de066..4d4c7d4 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -19,6 +19,7 @@ my %WriteMakefileArgs = ( - "PREREQ_PM" => { - "Carp" => 0, - "List::Util" => 0, -+ "Object::HashBase" => "0.008", - "Scalar::Util" => 0 - }, - "TEST_REQUIRES" => { -diff --git a/lib/Term/Table.pm b/lib/Term/Table.pm -index 578eba8..3190bcd 100644 ---- a/lib/Term/Table.pm -+++ b/lib/Term/Table.pm -@@ -11,7 +11,7 @@ use Scalar::Util qw/blessed/; - use List::Util qw/max sum/; - use Carp qw/croak carp/; - --use Term::Table::HashBase qw/rows _columns collapse max_width mark_tail sanitize show_header auto_columns no_collapse header allow_overflow pad/; -+use Object::HashBase 0.008 qw/rows _columns collapse max_width mark_tail sanitize show_header auto_columns no_collapse header allow_overflow pad/; - - sub BORDER_SIZE() { 4 } # '| ' and ' |' borders - sub DIV_SIZE() { 3 } # ' | ' column delimiter -diff --git a/lib/Term/Table/Cell.pm b/lib/Term/Table/Cell.pm -index 978ef06..10d2b70 100644 ---- a/lib/Term/Table/Cell.pm -+++ b/lib/Term/Table/Cell.pm -@@ -9,7 +9,7 @@ use Term::Table::Util qw/uni_length/; - - use List::Util qw/sum/; - --use Term::Table::HashBase qw/value border_left border_right _break _widths border_color value_color reset_color/; -+use Object::HashBase 0.008 qw/value border_left border_right _break _widths border_color value_color reset_color/; - - my %CHAR_MAP = ( - # Special case, \n should render as \n, but also actually do the newline thing -diff --git a/lib/Term/Table/CellStack.pm b/lib/Term/Table/CellStack.pm -index 7b99f6a..a948d10 100644 ---- a/lib/Term/Table/CellStack.pm -+++ b/lib/Term/Table/CellStack.pm -@@ -4,7 +4,7 @@ use warnings; - - our $VERSION = '0.018'; - --use Term::Table::HashBase qw/-cells -idx/; -+use Object::HashBase 0.008 qw/-cells -idx/; - - use List::Util qw/max/; - -diff --git a/lib/Term/Table/LineBreak.pm b/lib/Term/Table/LineBreak.pm -index dc70ca3..ef95f7e 100644 ---- a/lib/Term/Table/LineBreak.pm -+++ b/lib/Term/Table/LineBreak.pm -@@ -8,7 +8,7 @@ use Carp qw/croak/; - use Scalar::Util qw/blessed/; - use Term::Table::Util qw/uni_length/; - --use Term::Table::HashBase qw/string gcstring _len _parts idx/; -+use Object::HashBase 0.008 qw/string gcstring _len _parts idx/; - - sub init { - my $self = shift; --- -2.21.0 - diff --git a/SPECS/perl-Term-Table.spec b/SPECS/perl-Term-Table.spec index 9208dd7..e9a9bcc 100644 --- a/SPECS/perl-Term-Table.spec +++ b/SPECS/perl-Term-Table.spec @@ -11,13 +11,11 @@ Name: perl-Term-Table Version: 0.018 -Release: 512%{?dist} +Release: 513%{?dist} Summary: Format a header and rows into a table License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Term-Table Source0: https://cpan.metacpan.org/authors/id/E/EX/EXODIST/Term-Table-%{version}.tar.gz -# Unbundle Object::HashBase -Patch0: Term-Table-0.018-Use-system-Object-HashBase.patch BuildArch: noarch BuildRequires: make BuildRequires: perl-generators @@ -30,9 +28,6 @@ BuildRequires: perl(warnings) BuildRequires: perl(Carp) BuildRequires: perl(Config) BuildRequires: perl(List::Util) -%if !%{defined perl_bootstrap} -BuildRequires: perl(Object::HashBase) >= 0.008 -%endif BuildRequires: perl(Scalar::Util) # Optional run-time: %if %{with perl_Term_Table_enables_terminal} @@ -58,10 +53,8 @@ Recommends: perl(Term::Size::Any) >= 0.002 Recommends: perl(Unicode::GCString) >= 2013.10 %endif -%if %{defined perl_bootstrap} # Filter modules bundled for tests -%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(main::HBase.*\\) -%endif +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(main::HBase|main::HBase::Wrapped\\)$ %description This Perl module is able to format rows of data into tables. @@ -77,14 +70,7 @@ with "%{_libexecdir}/%{name}/test". %prep %setup -q -n Term-Table-%{version} -%if !%{defined perl_bootstrap} -%patch -P0 -p1 -# Delete bundled Object::HashBase -for F in lib/Term/Table/HashBase.pm t/HashBase.t; do - perl -e 'unlink $ARGV[0] or die $!' "$F" - perl -i -s -ne 'print $_ unless m{\A\Q$file\E\b}' -- -file="$F" MANIFEST -done -%endif +# XXX Don't unbundle Term::Table::HashBase, the module is in Perl Core. # Help generators to recognize Perl scripts for F in t/*.t t/Table/*.t; do perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F" @@ -121,6 +107,10 @@ make test %{_libexecdir}/%{name} %changelog +* Thu Nov 21 2024 Michal Josef Špaček - 0.018-513 +- Revert bundling Term::Table::HashBase, module is in Perl Core + Resolves: RHEL-66303 + * Tue Oct 29 2024 Troy Dawson - 0.018-512 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018