diff --git a/.gitignore b/.gitignore index 0e90fc6..fd30f53 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /Alien-Build-1.32.tar.gz /Alien-Build-1.36.tar.gz /Alien-Build-1.37.tar.gz +/Alien-Build-1.39.tar.gz diff --git a/Alien-Build-1.37-Remove-redundant-pkgconfig-implementations.patch b/Alien-Build-1.39-Remove-redundant-pkgconfig-implementations.patch similarity index 96% rename from Alien-Build-1.37-Remove-redundant-pkgconfig-implementations.patch rename to Alien-Build-1.39-Remove-redundant-pkgconfig-implementations.patch index 6379243..57c52cf 100644 --- a/Alien-Build-1.37-Remove-redundant-pkgconfig-implementations.patch +++ b/Alien-Build-1.39-Remove-redundant-pkgconfig-implementations.patch @@ -1,4 +1,4 @@ -From 9cfe8835fcac12495c50e6b66727b310e40c4ca3 Mon Sep 17 00:00:00 2001 +From b835197a8a160a4e88a52789264f9d3622026c2d 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 @@ -14,11 +14,11 @@ Signed-off-by: Petr Písař --- MANIFEST | 4 - Makefile.PL | 4 +- - lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm | 16 +-- + lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm | 19 +-- t/01_use.t | 4 - t/alien_build_plugin_pkgconfig_negotiate.t | 2 +- t/alien_build_plugin_pkgconfig_negotiate__pick.t | 153 ++--------------------- - 6 files changed, 11 insertions(+), 172 deletions(-) + 6 files changed, 11 insertions(+), 175 deletions(-) diff --git a/MANIFEST b/MANIFEST index 559f19f..0e0a343 100644 @@ -50,7 +50,7 @@ index 559f19f..0e0a343 100644 t/alien_build_plugin_prefer_sortversions.t t/alien_build_plugin_probe_cbuilder.t diff --git a/Makefile.PL b/Makefile.PL -index 3551946..5870959 100644 +index cb1fa71..553de9b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -74,11 +74,9 @@ my %WriteMakefileArgs = ( @@ -73,7 +73,7 @@ index 3551946..5870959 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 fd1b816..6dce136 100644 +index 89622cf..7388c3a 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,12 +86,15 @@ index fd1b816..6dce136 100644 use Alien::Build::Util qw( _perl_config ); use Carp (); -@@ -32,18 +30,6 @@ sub pick +@@ -31,21 +29,6 @@ sub pick + { return 'PkgConfig::LibPkgConf'; } - +- - if(Alien::Build::Plugin::PkgConfig::CommandLine->available) - { +- # TODO: determine environment or flags necessary for using pkg-config +- # on solaris 64 bit. - if(! (_perl_config('osname') eq 'solaris' && _perl_config('ptrsize') == 8)) - { - return 'PkgConfig::CommandLine'; @@ -105,7 +108,7 @@ index fd1b816..6dce136 100644 else { # this is a fata error. because we check for a pkg-config implementation -@@ -51,7 +37,7 @@ sub pick +@@ -53,7 +36,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. @@ -333,5 +336,5 @@ index 105c6b6..db886f8 100644 done_testing; -- -2.13.6 +2.14.3 diff --git a/perl-Alien-Build.spec b/perl-Alien-Build.spec index a696ff3..ac92b88 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.37 +Version: 1.39 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.37-Remove-redundant-pkgconfig-implementations.patch +Patch0: Alien-Build-1.39-Remove-redundant-pkgconfig-implementations.patch BuildArch: noarch BuildRequires: make BuildRequires: perl-generators @@ -181,6 +181,9 @@ make test %{_mandir}/man3/* %changelog +* Mon Mar 12 2018 Petr Pisar - 1.39-1 +- 1.39 bump + * Mon Feb 26 2018 Petr Pisar - 1.37-1 - 1.37 bump diff --git a/sources b/sources index 9d1f14e..72eb34f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Alien-Build-1.37.tar.gz) = 16ffb70bc01f00a26ce0f43dc3d6d7f195ac61ff5a8bd5784a42c5a59caebe6e6beec3f46d2d04ea8fc55f9201fa09704f1f120743f541cb3d7ec6c6e7cb52ff +SHA512 (Alien-Build-1.39.tar.gz) = dbe5cec2cb9b681b35717721ca7958f9464a8d0979e6f3a4cbbf31833ef32938b2de649517f38e447d13a070a1676ab9fe8b4ebcd9ee639b7c75b0ea47d0089a