Compare commits

..

No commits in common. 'c8' and 'c9' have entirely different histories.
c8 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/Term-Table-0.012.tar.gz
SOURCES/Term-Table-0.015.tar.gz

@ -1 +1 @@
1f69c2d28fcb0b9617b46064b320b89fd8fc86cb SOURCES/Term-Table-0.012.tar.gz
db510c603cd766c5ada06aba7f55bd06de1f1596 SOURCES/Term-Table-0.015.tar.gz

@ -0,0 +1,84 @@
From 49bf49b99a7ffb12b68035f096c160bc51e48775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
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ř <ppisar@redhat.com>
---
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
@@ -20,6 +20,7 @@ my %WriteMakefileArgs = (
"Carp" => 0,
"Importer" => "0.024",
"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.015';
-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

@ -4,12 +4,14 @@
%bcond_without perl_Term_Table_enables_unicode
Name: perl-Term-Table
Version: 0.012
Release: 2%{?dist}
Version: 0.015
Release: 8%{?dist}
Summary: Format a header and rows into a table
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Term-Table/
Source0: http://www.cpan.org/authors/id/E/EX/EXODIST/Term-Table-%{version}.tar.gz
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.015-Use-system-Object-HashBase.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: perl-generators
@ -23,6 +25,7 @@ BuildRequires: perl(Carp)
BuildRequires: perl(Config)
BuildRequires: perl(Importer) >= 0.024
BuildRequires: perl(List::Util)
BuildRequires: perl(Object::HashBase) >= 0.008
BuildRequires: perl(Scalar::Util)
# Optional run-time:
%if %{with perl_Term_Table_enables_terminal}
@ -58,16 +61,23 @@ This Perl module is able to format rows of data into tables.
%prep
%setup -q -n Term-Table-%{version}
%patch0 -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
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
make %{?_smp_mflags}
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
%{make_build}
%install
make pure_install DESTDIR=$RPM_BUILD_ROOT
%{make_install}
%{_fixperms} $RPM_BUILD_ROOT/*
%check
unset TABLE_TERM_SIZE
make test
%files
@ -77,6 +87,52 @@ make test
%{_mandir}/man3/*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.015-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.015-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.015-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.015-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.015-4
- Perl 5.32 rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.015-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Nov 21 2019 Petr Pisar <ppisar@redhat.com> - 0.015-2
- Unbundle Object::HashBase
* Tue Nov 19 2019 Petr Pisar <ppisar@redhat.com> - 0.015-1
- 0.015 bump
* Wed Oct 16 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.014-1
- 0.014 bump
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.013-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.013-3
- Perl 5.30 rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.013-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Dec 05 2018 Petr Pisar <ppisar@redhat.com> - 0.013-1
- 0.013 bump
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.012-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.012-3
- Perl 5.28 rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.012-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Loading…
Cancel
Save