diff --git a/.gitignore b/.gitignore index 332cfc7..051d97a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /Alien-Build-1.05.tar.gz /Alien-Build-1.10.tar.gz /Alien-Build-1.16.tar.gz +/Alien-Build-1.18.tar.gz diff --git a/Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch b/Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch similarity index 81% rename from Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch rename to Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch index 4b51a70..d1f1d56 100644 --- a/Alien-Build-1.10-Remove-redundant-pkgconfig-implementations.patch +++ b/Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch @@ -1,4 +1,4 @@ -From 5fe836a4bd6b192147c68eb919222eeba3227dae Mon Sep 17 00:00:00 2001 +From c00c30fb159f4a90a57191ffbcfe665923ee1455 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,14 +17,14 @@ Signed-off-by: Petr Písař lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm | 16 +-- t/01_use.t | 4 - t/alien_build_plugin_pkgconfig_negotiate.t | 2 +- - t/alien_build_plugin_pkgconfig_negotiate__pick.t | 125 ----------------------- - 6 files changed, 3 insertions(+), 152 deletions(-) + t/alien_build_plugin_pkgconfig_negotiate__pick.t | 139 ++--------------------- + 6 files changed, 11 insertions(+), 158 deletions(-) diff --git a/MANIFEST b/MANIFEST -index 8feff60..2a2dd52 100644 +index 655a1a2..e6d3798 100644 --- a/MANIFEST +++ b/MANIFEST -@@ -146,11 +146,9 @@ lib/Alien/Build/Plugin/Fetch/Local.pm +@@ -144,11 +144,9 @@ lib/Alien/Build/Plugin/Fetch/Local.pm lib/Alien/Build/Plugin/Fetch/LocalDir.pm lib/Alien/Build/Plugin/Fetch/NetFTP.pm lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm @@ -36,7 +36,7 @@ index 8feff60..2a2dd52 100644 lib/Alien/Build/Plugin/Prefer.pod lib/Alien/Build/Plugin/Prefer/BadVersion.pm lib/Alien/Build/Plugin/Prefer/SortVersions.pm -@@ -217,12 +215,10 @@ t/alien_build_plugin_fetch_lwp.t +@@ -213,12 +211,10 @@ t/alien_build_plugin_fetch_lwp.t t/alien_build_plugin_fetch_netftp.t t/alien_build_plugin_gather_isolatedynamic.t t/alien_build_plugin_meta.t @@ -50,7 +50,7 @@ index 8feff60..2a2dd52 100644 t/alien_build_plugin_prefer_sortversions.t t/alien_build_plugin_probe_cbuilder.t diff --git a/Makefile.PL b/Makefile.PL -index cf47d0f..39b6eb3 100644 +index 253cfdd..039543d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -71,11 +71,9 @@ my %WriteMakefileArgs = ( @@ -65,7 +65,7 @@ index cf47d0f..39b6eb3 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/SortVersions.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/SortVersions.pm", -@@ -182,4 +180,4 @@ sub requires { goto &runtime_requires } +@@ -181,4 +179,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 cf47d0f..39b6eb3 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 b1845d0..9b43e8d 100644 +index d8f3af2..ba6d875 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; @@ -86,7 +86,7 @@ index b1845d0..9b43e8d 100644 use Alien::Build::Util qw( _perl_config ); use Carp (); -@@ -32,21 +30,9 @@ sub pick +@@ -32,18 +30,6 @@ sub pick return 'PkgConfig::LibPkgConf'; } @@ -104,13 +104,18 @@ index b1845d0..9b43e8d 100644 - } else { -- Carp::carp("Could not find an appropriate pkg-config implementation, please install PkgConfig.pm, PkgConfig::LibPkgConf, pkg-config or pkgconf"); -+ Carp::carp("Could not find an appropriate pkg-config implementation, please install PkgConfig::LibPkgConf"); + # this is a fata error. because we check for a pkg-config implementation +@@ -51,7 +37,7 @@ sub pick + # fallback on installing PkgConfig.pm as a prereq if nothing else is avail). + # we therefore expect at least one of these to work, if not, then the configuration + # of the system has shifted from underneath us. +- Carp::croak("Could not find an appropriate pkg-config implementation, please install PkgConfig.pm, PkgConfig::LibPkgConf, pkg-config or pkgconf"); ++ Carp::croak("Could not find an appropriate pkg-config implementation, please install PkgConfig::LibPkgConf"); } } diff --git a/t/01_use.t b/t/01_use.t -index 08dc563..344d242 100644 +index a2dc604..c52e3ce 100644 --- a/t/01_use.t +++ b/t/01_use.t @@ -37,11 +37,9 @@ require_ok 'Alien::Build::Plugin::Fetch::Local'; @@ -125,7 +130,7 @@ index 08dc563..344d242 100644 require_ok 'Alien::Build::Plugin::Prefer::BadVersion'; require_ok 'Alien::Build::Plugin::Prefer::SortVersions'; require_ok 'Alien::Build::Plugin::Probe::CBuilder'; -@@ -91,11 +89,9 @@ ok(-f 't/alien_build_plugin_fetch_local.t', 'test for Alien::Build::Plugin::Fetc +@@ -90,11 +88,9 @@ ok(-f 't/alien_build_plugin_fetch_local.t', 'test for Alien::Build::Plugin::Fetc ok(-f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::Build::Plugin::Fetch::LocalDir'); ok(-f 't/alien_build_plugin_fetch_netftp.t', 'test for Alien::Build::Plugin::Fetch::NetFTP'); ok(-f 't/alien_build_plugin_gather_isolatedynamic.t', 'test for Alien::Build::Plugin::Gather::IsolateDynamic'); @@ -138,7 +143,7 @@ index 08dc563..344d242 100644 ok(-f 't/alien_build_plugin_prefer_sortversions.t', 'test for Alien::Build::Plugin::Prefer::SortVersions'); ok(-f 't/alien_build_plugin_probe_cbuilder.t', 'test for Alien::Build::Plugin::Probe::CBuilder'); diff --git a/t/alien_build_plugin_pkgconfig_negotiate.t b/t/alien_build_plugin_pkgconfig_negotiate.t -index 2241348..30a5451 100644 +index 95e0d84..9492ea1 100644 --- a/t/alien_build_plugin_pkgconfig_negotiate.t +++ b/t/alien_build_plugin_pkgconfig_negotiate.t @@ -16,7 +16,7 @@ subtest 'pick' => sub { @@ -151,10 +156,38 @@ index 2241348..30a5451 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 b0797ca..6b4decc 100644 +index b0797ca..e68ff05 100644 --- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t +++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t -@@ -55,131 +55,6 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new( +@@ -24,9 +24,10 @@ subtest 'LibPkgConf' => sub { + + local $PkgConfig::LibPkgConf::VERSION = '0.01'; + +- isnt( +- Alien::Build::Plugin::PkgConfig::Negotiate->pick, +- 'PkgConfig::LibPkgConf', ++ eval { Alien::Build::Plugin::PkgConfig::Negotiate->pick }; ++ ok( ++ $@, ++ 'PkgConfig::LibPkgConf "0.1" is too old', + ); + + }; +@@ -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 )) }; + +- isnt( +- Alien::Build::Plugin::PkgConfig::Negotiate->pick, +- 'PkgConfig::LibPkgConf', ++ eval { Alien::Build::Plugin::PkgConfig::Negotiate->pick }; ++ ok( ++ $@, ++ 'Missing PkgConfig::LibPkgConf triggers an exception', + ); + + }; +@@ -55,131 +57,6 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new( ], ); diff --git a/perl-Alien-Build.spec b/perl-Alien-Build.spec index ad4f3c5..437ed9c 100644 --- a/perl-Alien-Build.spec +++ b/perl-Alien-Build.spec @@ -2,7 +2,7 @@ %{bcond_without perl_Alien_Build_enables_optional_test} Name: perl-Alien-Build -Version: 1.16 +Version: 1.18 Release: 1%{?dist} Summary: Build external dependencies for use in CPAN License: GPL+ or Artistic @@ -10,7 +10,7 @@ URL: http://search.cpan.org/dist/Alien-Build/ Source0: http://www.cpan.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.10-Remove-redundant-pkgconfig-implementations.patch +Patch0: Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch BuildArch: noarch BuildRequires: make BuildRequires: perl-generators @@ -87,7 +87,7 @@ BuildRequires: perl(Test2::V0) >= 0.000060 # Optional tests: %if !%{defined perl_bootstrap} # Break build cycle: Acme::Alien::DontPanic → Test::Alien -BuildRequires: perl(Acme::Alien::DontPanic) +BuildRequires: perl(Acme::Alien::DontPanic) >= 0.026 %endif BuildRequires: perl(Alien::Base::ModuleBuild) >= 0.040 BuildRequires: perl(Alien::Base::PkgConfig) >= 0.040 @@ -173,6 +173,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Sep 26 2017 Petr Pisar - 1.18-1 +- 1.18 bump + * Tue Sep 19 2017 Petr Pisar - 1.16-1 - 1.16 bump diff --git a/sources b/sources index c4fbb8a..c98d770 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Alien-Build-1.16.tar.gz) = 3c914daa80eaca10532f26cfdcc014899739e1d8d19ba81473063648b4a04edae4f14f57a9aec53d9575719069a81db3d652638d971b034d2bc869deef0f037f +SHA512 (Alien-Build-1.18.tar.gz) = 06f25c156167d3d15a5b51daf694c67d6a7b164ceebedb81a3ee7b2ea4a81649b2a58ede3bb46f867862c7e37b0f30d0e37bf43d5f1f68231dc938d58ce55628