8 changed files with 83 additions and 142 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1 @@
 /Text-Tabs+Wrap-2013.0523.tar.gz
-/Text-Tabs+Wrap-2021.0726.tar.gz
-/Text-Tabs+Wrap-2021.0804.tar.gz
-/Text-Tabs+Wrap-2021.0814.tar.gz
-/Text-Tabs+Wrap-2023.0511.tar.gz
-/Text-Tabs+Wrap-2024.001.tar.gz
--- a/Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
+++ b/Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
@ -0,0 +1,56 @@
+From 425354918f774c39c68b79de55691ee262cdcb84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Wed, 25 Mar 2015 17:57:05 +0100
+Subject: [PATCH] Build from lib
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building from lib.modern adds "modern::" prefix to manual pages.
+
+This is a work-around for CPAN RT#103116. Creating symlink is not
+enough for EU::MM.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+diff --git a/Makefile.PL b/Makefile.PL
+index a8dbc7e..1b5b51a 100644
+--- a/Makefile.PL
+++ b/Makefile.PL
+@@ -1,10 +1,15 @@
+ 
+ use ExtUtils::MakeMaker;
+ 
+if (!-d 'lib') {
+    rename (($] > 5.010 ? 'lib.modern' : 'lib.old'), 'lib') or
+        die "Could not rename to lib: $!";
+}
+
+ WriteMakefile( 
+ 	'NAME'		=> 'Text-Wrap',
+ 	'DISTNAME'	  => 'Text-Tabs+Wrap',
+-	'VERSION_FROM' => 'lib.modern/Text/Wrap.pm',
+	'VERSION_FROM' => 'lib/Text/Wrap.pm',
+ 	($] >= 5.005 ? 
+ 		(
+ 			ABSTRACT	=> 'Expand tabs and do simple line wrapping',
+@@ -21,16 +26,5 @@ WriteMakefile(
+ 	'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" },
+ 	'INSTALLDIRS'	=> 'perl',
+ 
+-	PM =>	($] > 5.010 ?
+-		{
+-			'lib.modern/Text/Tabs.pm'	=> '$(INST_LIBDIR)/Text/Tabs.pm',
+-			'lib.modern/Text/Wrap.pm'	=> '$(INST_LIBDIR)/Text/Wrap.pm',
+-		}
+-		:
+-		{
+-			'lib.old/Text/Tabs.pm'	=> '$(INST_LIBDIR)/Text/Tabs.pm',
+-			'lib.old/Text/Wrap.pm'	=> '$(INST_LIBDIR)/Text/Wrap.pm',
+-		})
+-
+ 	);
+ 
+-- 
+2.1.0
+
--- a/gating.yaml
+++ b/gating.yaml
@ -1,19 +0,0 @@
-# Fedora
--- !Policy
-id: fedora_policy
-product_versions:
-  - fedora-*
-decision_contexts:
-  - bodhi_update_push_testing
-  - bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
-# RHEL
--- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/perl-Text-Tabs+Wrap.spec
+++ b/perl-Text-Tabs+Wrap.spec
@ -1,30 +1,32 @@
 Name:           perl-Text-Tabs+Wrap
-Version:        2024.001
-Release:        511%{?dist}
+Version:        2013.0523
+Release:        460%{?dist}
 Summary:        Expand tabs and do simple line wrapping
 License:        TTWL
 URL:            https://metacpan.org/release/Text-Tabs%2BWrap
-Source0:        https://cpan.metacpan.org/authors/id/A/AR/ARISTOTLE/Text-Tabs+Wrap-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/authors/id/M/MU/MUIR/modules/Text-Tabs+Wrap-%{version}.tar.gz
+# Work around CPAN RT#103116
+Patch0:         Text-Tabs+Wrap-2013.0523-Build-from-lib.patch
 BuildArch:      noarch
-BuildRequires:  coreutils
-BuildRequires:  make
-BuildRequires:  perl-generators
+BuildRequires: make
 BuildRequires:  perl-interpreter
-BuildRequires:  perl(Config)
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
-BuildRequires:  perl(strict)
-BuildRequires:  perl(warnings)
+BuildRequires:  perl-generators
+BuildRequires:  perl(ExtUtils::MakeMaker)
 # Run-time:
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(re)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings::register)
 # Tests:
 BuildRequires:  perl(bytes)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(warnings)
 # Optional tests:
 # Benchmark not used
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # Sub-packaged from perl.spec, it would conflicted on manual pages
 Conflicts:      perl < 4:5.20.2-325
-Requires:       perl(warnings)

 %description
 Text::Tabs performs the same job that the UNIX expand(1) and unexpand(1)
@ -33,110 +35,34 @@ commands do: adding or removing tabs from a document.
 Text::Wrap::wrap() will reformat lines into paragraphs. All it does is break
 up long lines, it will not join short lines together.

-%package tests
-Summary:        Tests for %{name}
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       perl-Test-Harness
-Requires:       perl(warnings)
-
-%description tests
-Tests from %{name}. Execute them
-with "%{_libexecdir}/%{name}/test".
-
 %prep
 %setup -q -n Text-Tabs+Wrap-%{version}
-
-# Help generators to recognize Perl scripts
-for F in t/*.t; do
-    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
-    chmod +x "$F"
-done
+%patch0 -p1

 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
-%{make_build}
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}

 %install
-%{make_install}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} %{buildroot}/*

-# 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 -I . -j "$(getconf _NPROCESSORS_ONLN)"
-EOF
-chmod +x %{buildroot}%{_libexecdir}/%{name}/test
-
 %check
-export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
 make test

 %files
-%doc Changes README
-%{perl_vendorlib}/Text*
-%{_mandir}/man3/Text::*
-
-%files tests
-%{_libexecdir}/%{name}
+%doc CHANGELOG README
+%{perl_vendorlib}/*
+%{_mandir}/man3/*

 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2024.001-511
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Tue Aug 24 2021 Brian Stinson <bstinson@redhat.com> - 2013.0523-460
+- Rebuilt for IMA sigs, glibc 2.34, and aarch64 flags
+  Relates: rhbz#1991688

-* Thu Jul 18 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2024.001-510
- Increase release to favour standalone package
-
-* Thu Jul 18 2024 Jitka Plesnikova <jplesnik@redhat.com> - 2024.001-1
- 2024.001 bump
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2023.0511-6
- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0511-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0511-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023.0511-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2023.0511-2
- Perl 5.38 rebuild
-
-* Thu May 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2023.0511-1
- 2023.0511 bump
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0814-490
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0814-489
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2021.0814-488
- Increase release to favour standalone package
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021.0814-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 25 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2021.0814-1
- 2021.0814 bump
-
-* Mon Aug 09 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2021.0804-1
- 2021.0804 bump
-
-* Tue Aug 03 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2021.0726-1
- 2021.0726 bump
- Package tests
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2013.0523-478
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 2013.0523-477
- Increase release to favour standalone package
+* Fri Apr 16 2021 Brian Stinson <bstinson@redhat.com> - 2013.0523-459
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2013.0523-458
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
--- a/plans/sanity.fmf
+++ b/plans/sanity.fmf
@ -1,5 +0,0 @@
-summary: Sanity tests
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (Text-Tabs+Wrap-2024.001.tar.gz) = 54399cdc8acf435c0c80ed9d3128438af043fbacb60a1252e806de339ea2c1b53dca544bbfcc9bf97ba07cfde23b5e82147b4b4066e42e5c1bb61220d6a9c888
+SHA512 (Text-Tabs+Wrap-2013.0523.tar.gz) = 870010e150d23ad1b9396642858f96a4f370a3d44dd7423884e103554f1e6a2e2ce70288ed2a773667cdebbaabecdd76b193954288be79e397ea2e029050da22
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@ -1,11 +0,0 @@
-summary: Upstream tests
-component: perl-Text-Tabs+Wrap
-require: perl-Text-Tabs+Wrap-tests
-test: /usr/libexec/perl-Text-Tabs+Wrap/test
-enabled: true
-tag:
-  - rhel-buildroot
-adjust:
-  - enabled: false
-    when: distro < rhel-10 or distro < centos-stream-10
-    continue: false