From 44584117abff056aa45f6c737fb05cba272e8785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 28 Jan 2020 09:31:51 +0100 Subject: [PATCH] 1.96 bump --- .gitignore | 1 + ...-redundant-pkgconfig-implementations.patch | 47 +++++++++---------- perl-Alien-Build.spec | 11 ++--- sources | 2 +- 4 files changed, 28 insertions(+), 33 deletions(-) rename Alien-Build-1.83-Remove-redundant-pkgconfig-implementations.patch => Alien-Build-1.96-Remove-redundant-pkgconfig-implementations.patch (91%) diff --git a/.gitignore b/.gitignore index 3bee0f0..f2da4f3 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /Alien-Build-1.92.tar.gz /Alien-Build-1.93.tar.gz /Alien-Build-1.94.tar.gz +/Alien-Build-1.96.tar.gz diff --git a/Alien-Build-1.83-Remove-redundant-pkgconfig-implementations.patch b/Alien-Build-1.96-Remove-redundant-pkgconfig-implementations.patch similarity index 91% rename from Alien-Build-1.83-Remove-redundant-pkgconfig-implementations.patch rename to Alien-Build-1.96-Remove-redundant-pkgconfig-implementations.patch index d833fb9..7816709 100644 --- a/Alien-Build-1.83-Remove-redundant-pkgconfig-implementations.patch +++ b/Alien-Build-1.96-Remove-redundant-pkgconfig-implementations.patch @@ -1,4 +1,4 @@ -From f4f038fea8c62b6a6d86daf1fe07bb11a8c24c46 Mon Sep 17 00:00:00 2001 +From 0cb918b9a9b9080c61556c0e6a167855ca9c7f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 8 Sep 2017 11:31:02 +0200 Subject: [PATCH] Remove redundant pkgconfig implementations @@ -17,11 +17,11 @@ Signed-off-by: Petr Písař lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm | 25 +-- t/01_use.t | 4 - t/alien_build_plugin_pkgconfig_negotiate.t | 2 +- - ...n_build_plugin_pkgconfig_negotiate__pick.t | 181 +----------------- - 6 files changed, 11 insertions(+), 209 deletions(-) + ...n_build_plugin_pkgconfig_negotiate__pick.t | 176 +----------------- + 6 files changed, 11 insertions(+), 204 deletions(-) diff --git a/MANIFEST b/MANIFEST -index 10efe75..afb43c8 100644 +index 23f181a..eb81c8b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -177,11 +177,9 @@ lib/Alien/Build/Plugin/Fetch/LocalDir.pm @@ -36,7 +36,7 @@ index 10efe75..afb43c8 100644 lib/Alien/Build/Plugin/Prefer.pod lib/Alien/Build/Plugin/Prefer/BadVersion.pm lib/Alien/Build/Plugin/Prefer/GoodVersion.pm -@@ -263,12 +261,10 @@ t/alien_build_plugin_fetch_netftp.t +@@ -265,12 +263,10 @@ t/alien_build_plugin_fetch_netftp.t t/alien_build_plugin_fetch_wget.t t/alien_build_plugin_gather_isolatedynamic.t t/alien_build_plugin_meta.t @@ -50,7 +50,7 @@ index 10efe75..afb43c8 100644 t/alien_build_plugin_prefer_goodversion.t t/alien_build_plugin_prefer_sortversions.t diff --git a/Makefile.PL b/Makefile.PL -index 565bb3d..167cde9 100644 +index 63b5258..7c79e1a 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -86,11 +86,9 @@ my %WriteMakefileArgs = ( @@ -65,7 +65,7 @@ index 565bb3d..167cde9 100644 "lib/Alien/Build/Plugin/Prefer.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer.pod", "lib/Alien/Build/Plugin/Prefer/BadVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/BadVersion.pm", "lib/Alien/Build/Plugin/Prefer/GoodVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/GoodVersion.pm", -@@ -199,4 +197,4 @@ sub requires { goto &runtime_requires } +@@ -197,4 +195,4 @@ sub requires { goto &runtime_requires } sub runtime_requires { my ( $module, $version_or_range ) = @_; _add_prereq( PREREQ_PM => $module, $version_or_range ); @@ -73,7 +73,7 @@ index 565bb3d..167cde9 100644 \ No newline at end of file +} diff --git a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm -index 9a31441..1687619 100644 +index 56fe5a6..aff683c 100644 --- a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm +++ b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm @@ -3,9 +3,7 @@ package Alien::Build::Plugin::PkgConfig::Negotiate; @@ -124,7 +124,7 @@ index 9a31441..1687619 100644 } diff --git a/t/01_use.t b/t/01_use.t -index dba2600..a874761 100644 +index 2c7845d..8a43feb 100644 --- a/t/01_use.t +++ b/t/01_use.t @@ -45,11 +45,9 @@ require_ok 'Alien::Build::Plugin::Fetch::LocalDir'; @@ -139,7 +139,7 @@ index dba2600..a874761 100644 require_ok 'Alien::Build::Plugin::Prefer::BadVersion'; require_ok 'Alien::Build::Plugin::Prefer::GoodVersion'; require_ok 'Alien::Build::Plugin::Prefer::SortVersions'; -@@ -110,11 +108,9 @@ ok -f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::B +@@ -111,11 +109,9 @@ ok -f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::B ok -f 't/alien_build_plugin_fetch_netftp.t', 'test for Alien::Build::Plugin::Fetch::NetFTP'; ok -f 't/alien_build_plugin_fetch_wget.t', 'test for Alien::Build::Plugin::Fetch::Wget'; ok -f 't/alien_build_plugin_gather_isolatedynamic.t', 'test for Alien::Build::Plugin::Gather::IsolateDynamic'; @@ -152,10 +152,10 @@ index dba2600..a874761 100644 ok -f 't/alien_build_plugin_prefer_goodversion.t', 'test for Alien::Build::Plugin::Prefer::GoodVersion'; ok -f 't/alien_build_plugin_prefer_sortversions.t', 'test for Alien::Build::Plugin::Prefer::SortVersions'; diff --git a/t/alien_build_plugin_pkgconfig_negotiate.t b/t/alien_build_plugin_pkgconfig_negotiate.t -index b9b8d65..3575697 100644 +index 8ac54b2..981f88c 100644 --- a/t/alien_build_plugin_pkgconfig_negotiate.t +++ b/t/alien_build_plugin_pkgconfig_negotiate.t -@@ -16,7 +16,7 @@ subtest 'pick' => sub { +@@ -15,7 +15,7 @@ subtest 'pick' => sub { subtest 'override' => sub { @@ -165,10 +165,10 @@ index b9b8d65..3575697 100644 local $ENV{ALIEN_BUILD_PKG_CONFIG} = "PkgConfig::$name"; subtest $ENV{ALIEN_BUILD_PKG_CONFIG} => sub { diff --git a/t/alien_build_plugin_pkgconfig_negotiate__pick.t b/t/alien_build_plugin_pkgconfig_negotiate__pick.t -index 1d53259..e242728 100644 +index 148b794..947c05d 100644 --- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t +++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t -@@ -25,9 +25,10 @@ subtest 'LibPkgConf' => sub { +@@ -24,9 +24,10 @@ subtest 'LibPkgConf' => sub { local $PkgConfig::LibPkgConf::VERSION = '0.01'; @@ -182,7 +182,7 @@ index 1d53259..e242728 100644 ); }; -@@ -40,9 +41,10 @@ subtest 'LibPkgConf' => sub { +@@ -39,9 +40,10 @@ subtest 'LibPkgConf' => sub { # cannot be loaded for the rest of this .t file note scalar capture_merged { Devel::Hide->import(qw( PkgConfig::LibPkgConf )) }; @@ -196,7 +196,7 @@ index 1d53259..e242728 100644 ); }; -@@ -56,172 +58,5 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new( +@@ -54,167 +56,5 @@ my $make_pkgconfig_libpkgconf_unavailable = mock 'Alien::Build::Plugin::PkgConfi ], ); @@ -207,8 +207,7 @@ index 1d53259..e242728 100644 - - my %which; - -- my $mock = Test2::Mock->new( -- class => 'File::Which', +- my $mock = mock 'File::Which' => ( - override => [ - which => sub { - my($prog) = @_; @@ -232,9 +231,7 @@ index 1d53259..e242728 100644 - ], - ); - -- my $mock2 = Test2::Mock->new( -- class => 'Alien::Build::Plugin::PkgConfig::Negotiate', -- ); +- my $mock2 = mock 'Alien::Build::Plugin::PkgConfig::Negotiate'; - - if($^O =~ /^(solaris|MSWin32)$/) { - $mock2->override( @@ -302,8 +299,7 @@ index 1d53259..e242728 100644 - # From the old AB::MB days we prefer PkgConfig.pm - # for 64 bit solaris over the command line pkg-config - -- my $mock2 = Test2::Mock->new( -- class => 'Alien::Build::Plugin::PkgConfig::Negotiate', +- my $mock2 = mock 'Alien::Build::Plugin::PkgConfig::Negotiate' => ( - override => [ - _perl_config => sub { - my($key) = @_; @@ -332,8 +328,7 @@ index 1d53259..e242728 100644 - # From the old AB::MB days we prefer PkgConfig.pm - # for 64 bit solaris over the command line pkg-config - -- my $mock2 = Test2::Mock->new( -- class => 'Alien::Build::Plugin::PkgConfig::Negotiate', +- my $mock2 = mock 'Alien::Build::Plugin::PkgConfig::Negotiate' => ( - override => [ - _perl_config => sub { - my($key) = @_; @@ -370,5 +365,5 @@ index 1d53259..e242728 100644 done_testing; -- -2.21.0 +2.21.1 diff --git a/perl-Alien-Build.spec b/perl-Alien-Build.spec index 201ffd5..6ac0870 100644 --- a/perl-Alien-Build.spec +++ b/perl-Alien-Build.spec @@ -7,7 +7,7 @@ %endif Name: perl-Alien-Build -Version: 1.94 +Version: 1.96 Release: 1%{?dist} Summary: Build external dependencies for use in CPAN # lib/Alien/Build/Plugin/Test/Mock.pm contains Base64-encoded files for tests @@ -18,7 +18,7 @@ URL: https://metacpan.org/release/Alien-Build Source0: https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-%{version}.tar.gz # Support only the most advanced pkgconfig implementation, # the files are deleted in prep section -Patch0: Alien-Build-1.83-Remove-redundant-pkgconfig-implementations.patch +Patch0: Alien-Build-1.96-Remove-redundant-pkgconfig-implementations.patch BuildArch: noarch BuildRequires: make # Makefile.PL executes ./inc/probebad.pl that executes XS checks @@ -64,7 +64,6 @@ BuildRequires: perl(File::Copy) BuildRequires: perl(File::Find) BuildRequires: perl(JSON::PP) # List::Util 1.33 not used at tests -BuildRequires: perl(Module::Load) BuildRequires: perl(overload) BuildRequires: perl(Path::Tiny) >= 0.077 # Alien::Build::Plugin::PkgConfig::Negotiate finds a pkgconfig implementation @@ -99,9 +98,6 @@ BuildRequires: perl(List::Util) >= 1.33 # Mojolicious::Lite not used BuildRequires: perl(Net::FTP) # Proc::Daemon not used -BuildRequires: perl(Test2::Mock) >= 0.000060 -BuildRequires: perl(Test2::Require) >= 0.000060 -BuildRequires: perl(Test2::Require::Module) >= 0.000060 BuildRequires: perl(Test2::V0) >= 0.000060 # URI not used BuildRequires: perl(utf8) @@ -264,6 +260,9 @@ make test %{_mandir}/man3/Alien::Build::Plugin::Decode::Mojo.3pm.* %changelog +* Tue Jan 28 2020 Petr Pisar - 1.96-1 +- 1.96 bump + * Tue Dec 17 2019 Jitka Plesnikova - 1.94-1 - 1.94 bump diff --git a/sources b/sources index bfa8ae1..032a9ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Alien-Build-1.94.tar.gz) = 175691dd76aaaef93618a0b14bb7b025a664902d436208cf621277d76b4baea3f1227db1e9522cf64259257d0f955cacad7b237a30a046cca7aff1e448633393 +SHA512 (Alien-Build-1.96.tar.gz) = 369707de30c493a85c44e9519e16479049ce74bbccd0e08d5203b8ebb08e52a73633e5403fb90a06f95b0583647d1c62f3133c7cab1cb9496f0cbc8dff92fbfe