From 491368d6f2023b5140f9824b0a2cd2509792c6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 23 Mar 2021 11:07:50 +0100 Subject: [PATCH] Break build cycle --- perl-PkgConfig-LibPkgConf.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/perl-PkgConfig-LibPkgConf.spec b/perl-PkgConfig-LibPkgConf.spec index e9fc0c9..e8fb65d 100644 --- a/perl-PkgConfig-LibPkgConf.spec +++ b/perl-PkgConfig-LibPkgConf.spec @@ -1,6 +1,11 @@ +# Locate pkgconfig using Alien::pkgconf. +# Disabled by default because it creates a build cycle (perl-Alien-pkgconf → +# perl-Alien-Build → perl-PkgConfig-LibPkgConf). +%bcond_with perl_PkgConfig_LibPkgConf_enables_Alien_pkgconf + Name: perl-PkgConfig-LibPkgConf Version: 0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Interface to pkg-config files via libpkgconf License: GPL+ or Artistic URL: https://metacpan.org/release/PkgConfig-LibPkgConf @@ -12,9 +17,14 @@ BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: perl(:VERSION) >= 5.8.1 +%if %{with perl_PkgConfig_LibPkgConf_enables_Alien_pkgconf} # Use Alien::pkgconf instead of some complicated guess # script/cc_wrapper.pl and script/ld_wrapper.pl not used with Alien::pkgconf BuildRequires: perl(Alien::pkgconf) >= 0.12 +%else +# script/cc_wrapper.pl and script/ld_wrapper.pl not used with pkgconf +BuildRequires: pkgconf +%endif BuildRequires: pkgconfig(libpkgconf) >= 1.5.0 BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.98 @@ -50,6 +60,7 @@ files. This package provides a Perl-level API using libpkgconf to these files. %build unset FFI_PLATYPUS_DEBUG +export PKG_CONFIG=%{_bindir}/pkgconf perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS" %{make_build} @@ -69,6 +80,10 @@ make test %{_mandir}/man3/* %changelog +* Tue Mar 23 2021 Petr Pisar - 0.11-5 +- Break build cycle (perl-Alien-pkgconf → perl-Alien-Build + → perl-PkgConfig-LibPkgConf) + * Wed Jan 27 2021 Fedora Release Engineering - 0.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild