.gitignore

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

.perl-Term-Table.metadata

@@ -1 +1 @@
-db510c603cd766c5ada06aba7f55bd06de1f1596 SOURCES/Term-Table-0.015.tar.gz
+c10d8dd797ae99d08c330f584c9ce6a0fdc795b5 SOURCES/Term-Table-0.018.tar.gz

SOURCES/Term-Table-0.018-Use-system-Object-HashBase.patch

@@ -19,9 +19,9 @@ diff --git a/Makefile.PL b/Makefile.PL
 index 44de066..4d4c7d4 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -20,6 +20,7 @@ my %WriteMakefileArgs = (
+@@ -19,6 +19,7 @@ my %WriteMakefileArgs = (
+   "PREREQ_PM" => {
      "Carp" => 0,
-     "Importer" => "0.024",
      "List::Util" => 0,
 +    "Object::HashBase" => "0.008",
      "Scalar::Util" => 0
@@ -58,9 +58,9 @@ 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';
- 
+
+ our $VERSION = '0.018';
+
 -use Term::Table::HashBase qw/-cells -idx/;
 +use Object::HashBase 0.008 qw/-cells -idx/;
  

SPECS/perl-Term-Table.spec

@@ -1,17 +1,23 @@
+# Disable non-core dependencies when bootstrapping a core module
+%if !%{defined perl_bootstrap}
 # Recognize terminal size
 %bcond_without perl_Term_Table_enables_terminal
 # Respect Unicode rules when breaking lines
 %bcond_without perl_Term_Table_enables_unicode
+%else
+%bcond_with perl_Term_Table_enables_terminal
+%bcond_with perl_Term_Table_enables_unicode
+%endif
 
 Name:           perl-Term-Table
-Version:        0.015
-Release:        8%{?dist}
+Version:        0.018
+Release:        511%{?dist}
 Summary:        Format a header and rows into a table
-License:        GPL+ or Artistic
+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.015-Use-system-Object-HashBase.patch
+Patch0:         Term-Table-0.018-Use-system-Object-HashBase.patch
 BuildArch:      noarch
 BuildRequires:  make
 BuildRequires:  perl-generators
@@ -23,9 +29,10 @@ BuildRequires:  perl(warnings)
 # Run-time:
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config)
-BuildRequires:  perl(Importer) >= 0.024
 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}
@@ -42,8 +49,6 @@ BuildRequires:  perl(Test2::API)
 BuildRequires:  perl(Test2::Tools::Tiny) >= 1.302097
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(utf8)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires:       perl(Importer) >= 0.024
 %if %{with perl_Term_Table_enables_terminal}
 Suggests:       perl(Term::ReadKey) >= 2.32
 # Prefer Term::Size::Any over Term::ReadKey
@@ -53,20 +58,38 @@ Recommends:     perl(Term::Size::Any) >= 0.002
 Recommends:     perl(Unicode::GCString) >= 2013.10
 %endif
 
-# Remove under-specified dependencies
-%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Importer\\)$
+%if %{defined perl_bootstrap}
+# Filter modules bundled for tests
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(main::HBase.*\\)
+%endif
 
 %description
 This Perl module is able to format rows of data into tables.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Term-Table-%{version}
-%patch0 -p1
+%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
+# 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"
+    chmod +x "$F"
+done
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -74,7 +97,15 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 
 %install
 %{make_install}
-%{_fixperms} $RPM_BUILD_ROOT/*
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -r -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+%{_fixperms} %{buildroot}/*
 
 %check
 unset TABLE_TERM_SIZE
@@ -86,13 +117,66 @@ make test
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %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
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.018-511
+- Rebuilt for MSVSphere 10
+
+* Fri Aug 09 2024 Jitka Plesnikova <jplesnik@redhat.com> - 0.018-511
+- Perl 5.40 re-rebuild of bootstrapped packages
+
+* Thu Aug 08 2024 Jitka Plesnikova <jplesnik@redhat.com> - 0.018-510
+- Increase release to favour standalone package
+
+* Fri Jul 19 2024 Jitka Plesnikova <jplesnik@redhat.com> - 0.018-5
+- Disable non-core dependencies when bootstrapping a core module
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.018-4
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.018-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.018-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 23 2023 Michal Josef Špaček <mspacek@redhat.com> - 0.018-1
+- 0.018 bump
+
+* Fri Sep 15 2023 Michal Josef Špaček <mspacek@redhat.com> - 0.017-1
+- 0.017 bump
+- Fix %patch macro
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.016-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.016-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 10 2022 Michal Josef Špaček <mspacek@redhat.com> - 0.016-5
+- Update license to SPDX format
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.016-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 0.016-3
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.016-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 05 2022 Michal Josef Špaček <mspacek@redhat.com> - 0.016-1
+- 0.016 bump
+- Package tests
+- Unify macros
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.015-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.015-7
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.015-7
+- Perl 5.34 rebuild
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.015-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild