diff options
| -rw-r--r-- | php-laminas-navigation.spec | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/php-laminas-navigation.spec b/php-laminas-navigation.spec index 4edba38..d34b150 100644 --- a/php-laminas-navigation.spec +++ b/php-laminas-navigation.spec @@ -6,7 +6,8 @@ # # Please, preserve the changelog entries # -%global bootstrap 0 +# when build without permission-acl +%global bootstrap 1 %global gh_commit 1b4210ea3afeffb8a69e502e169088180ba3275d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas @@ -15,15 +16,11 @@ %global php_home %{_datadir}/php %global namespace Laminas %global library Navigation -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else %global with_tests 0%{!?_without_tests:1} -%endif Name: php-%{gh_project} Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{namespace} Framework %{library} component License: BSD @@ -61,12 +58,14 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.6 BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.7.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-log) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0.4 with php-autoloader(%{gh_owner}/laminas-mvc) < 4) +%if ! %{bootstrap} BuildRequires: (php-autoloader(%{gh_owner}/laminas-permissions-acl) >= 2.6 with php-autoloader(%{gh_owner}/laminas-permissions-acl) < 3) +%endif BuildRequires: (php-autoloader(%{gh_owner}/laminas-router) >= 3.0.2 with php-autoloader(%{gh_owner}/laminas-router) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-uri) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.9 with php-autoloader(%{gh_owner}/laminas-view) < 3) -# remirepo:15 +# remirepo:17 %else BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge @@ -76,7 +75,9 @@ BuildRequires: php-laminas-http BuildRequires: php-laminas-i18n BuildRequires: php-laminas-log BuildRequires: php-laminas-mvc +%if ! %{bootstrap} BuildRequires: php-laminas-permissions-acl +%endif BuildRequires: php-laminas-router BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-uri @@ -93,7 +94,6 @@ BuildRequires: php-fedora-autoloader-devel # "laminas/laminas-stdlib": "^2.7 || ^3.0", # "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 -%if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) @@ -114,7 +114,6 @@ Suggests: php-autoloader(%{gh_owner}/laminas-view) Requires: php-laminas-stdlib Requires: php-laminas-zendframework-bridge %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.9.1 @@ -217,7 +216,11 @@ for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} \ +%if %{bootstrap} + --filter '^((?!(testProvidesExpectedConfiguration|testSetResourceInterface)).)*$' \ +%else --filter '^((?!(testProvidesExpectedConfiguration)).)*$' \ +%endif --verbose || ret=1 fi done @@ -238,6 +241,9 @@ exit $ret %changelog +* Mon Jan 27 2020 Remi Collet <remi@remirepo.net> - 2.9.1-3 +- bootstrap build without permissions-acl + * Mon Jan 20 2020 Remi Collet <remi@remirepo.net> - 2.9.1-2 - allow laminas-config v3 |