diff --git a/.gitignore b/.gitignore index f8f2814..98ec6d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Swim-0.1.46.tar.gz +/Swim-0.1.48.tar.gz diff --git a/Swim-0.1.46-Old-TestML-API-moved-to-TestML1-name-space.patch b/Swim-0.1.46-Old-TestML-API-moved-to-TestML1-name-space.patch deleted file mode 100644 index cc3bd02..0000000 --- a/Swim-0.1.46-Old-TestML-API-moved-to-TestML1-name-space.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 964b6a5927d5e82b764f30fe8ef9b1822f005e00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 19 Nov 2018 09:06:51 +0100 -Subject: [PATCH] Old TestML API moved to TestML1 name space -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - - -Signed-off-by: Petr Písař ---- - t/test.t | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/t/test.t b/t/test.t -index 12f074f..cb5e798 100644 ---- a/t/test.t -+++ b/t/test.t -@@ -2,7 +2,7 @@ use lib 'inc'; - use lib '../pegex-pm/lib'; - use lib '../testml-pm/lib'; - --use TestML; -+use TestML1; - - my $testml = join('', ); - my $debug = 0; -@@ -36,13 +36,13 @@ if (@ARGV) { - } - - --TestML->new( -+TestML1->new( - testml => $testml, - bridge => 'main', - )->run; - --use base 'TestML::Bridge'; --use TestML::Util; -+use base 'TestML1::Bridge'; -+use TestML1::Util; - use Swim::Grammar; - use Swim::Byte; - use Swim::HTML; --- -2.17.2 - diff --git a/perl-Swim.spec b/perl-Swim.spec index e2f8796..38061a6 100644 --- a/perl-Swim.spec +++ b/perl-Swim.spec @@ -1,17 +1,18 @@ Name: perl-Swim -Version: 0.1.46 -Release: 10%{?dist} +Version: 0.1.48 +Release: 1%{?dist} Summary: See What I Mean is a plain text markup language License: GPL+ or Artistic URL: https://metacpan.org/release/Swim Source0: https://cpan.metacpan.org/authors/id/I/IN/INGY/Swim-%{version}.tar.gz -# Old TestML API moved to TestML1 name space, bug #1650156 -Patch0: Swim-0.1.46-Old-TestML-API-moved-to-TestML1-name-space.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter +BuildRequires: perl(:VERSION) >= 5.8.1 +BuildRequires: perl(Config) +BuildRequires: perl(File::Find) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(File::ShareDir::Install) BuildRequires: perl(strict) @@ -31,16 +32,14 @@ BuildRequires: perl(Pegex::Base) BuildRequires: perl(Pegex::Grammar) BuildRequires: perl(Pegex::Parser) BuildRequires: perl(Pegex::Tree) -# Text::Autoformat not used at test-time +BuildRequires: perl(Text::Autoformat) BuildRequires: perl(YAML::XS) # Tests: -BuildRequires: perl(File::Find) BuildRequires: perl(lib) BuildRequires: perl(Test::More) # Test::Pod 1.41 not used -BuildRequires: perl(TestML1) -BuildRequires: perl(TestML1::Bridge) -BuildRequires: perl(TestML1::Util) +BuildRequires: perl(TestML::Bridge) +BuildRequires: perl(TestML::Run::TAP) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Hash::Merge) Requires: perl(IPC::Run) @@ -58,22 +57,22 @@ outputs is easy. %prep %setup -q -n Swim-%{version} -%patch0 -p1 # Remove bundled modules -rm -rf ./inc -sed -i -e '/^inc\//d' MANIFEST +rm -rf ./inc/lib +perl -i -ne 'print $_ unless m{^inc/lib/}' MANIFEST # Fix shebang -sed -i -e '1 s/^#!.*/#!perl/' bin/swim +perl -i -pe 's/^#!.*/#!perl/' bin/swim %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 AUTHOR_TESTING SWIM_LINK_FORMAT_HACK SWIM_PEGEX_DEBUG SWIM_PEGEX_TREE make test %files @@ -84,6 +83,9 @@ make test %{_mandir}/man3/* %changelog +* Fri Jan 10 2020 Petr Pisar - 0.1.48-1 +- 0.1.48 bump + * Fri Jul 26 2019 Fedora Release Engineering - 0.1.46-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index f485a8b..4a9661d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Swim-0.1.46.tar.gz) = 546050a907a90735a4adf8e66de877a1917dec96f85eeec9ec76dcb7a5755ab25cf027ef50eae8d543fd20bcc92894381cbc0b71d7170eef0cbbc88381e72287 +SHA512 (Swim-0.1.48.tar.gz) = 61b19c3169b46a045018d31aa254fce0ac96597c259584869cd9419470cf20e25c1bede2ef8bd5cf1efe196f3d26fdda07dd2314eba308aee4d519f7c3f0bd08