From dd629eba0f86fc581a18c0069dff28e6bbe7c121 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jan 2020 15:44:28 +0100 Subject: missing BR --- php-laminas-stdlib.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/php-laminas-stdlib.spec b/php-laminas-stdlib.spec index 2f65593..16221e6 100644 --- a/php-laminas-stdlib.spec +++ b/php-laminas-stdlib.spec @@ -23,7 +23,7 @@ Name: php-%{gh_project} Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Laminas Framework %{library} component License: BSD @@ -35,6 +35,13 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:3 +%else +BuildRequires: php-laminas-zendframework-bridge +%endif BuildRequires: php-iconv BuildRequires: php-intl BuildRequires: php-mbstring @@ -106,7 +113,7 @@ cat << 'EOF' | tee zf.php require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', - '%{php_home}/%{namespace}/%{library}/autoload.php', + dirname(dirname(__DIR__)) . '/%{namespace}/%{library}/autoload.php', ]); EOF @@ -162,7 +169,7 @@ exit $ret %changelog -* Mon Jan 6 2020 Remi Collet - 3.2.1-1 +* Mon Jan 6 2020 Remi Collet - 3.2.1-2 - switch to Laminas * Wed Aug 29 2018 Remi Collet - 3.2.1-1 -- cgit