summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-06-23 16:43:15 +0200
committerRemi Collet <remi@php.net>2022-06-23 16:43:15 +0200
commit4992ba0ffbd99d4bc8a705014905316cddd48869 (patch)
treefdddc3a0710017853c2e6d3a844868a40058b8ea
parente7b1a388f5d71c76b937bc43285b522ad6ff0649 (diff)
add dependency on laminas-servicemanager to workaroundHEADmaster
issue with old psr/container
-rw-r--r--php-laminas-authentication.spec15
1 files changed, 12 insertions, 3 deletions
diff --git a/php-laminas-authentication.spec b/php-laminas-authentication.spec
index 832de34..92cc2df 100644
--- a/php-laminas-authentication.spec
+++ b/php-laminas-authentication.spec
@@ -23,7 +23,7 @@
Name: php-%{gh_project}
Version: 2.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: %{namespace} Framework %{library} component
License: BSD
@@ -44,6 +44,7 @@ BuildRequires: php-spl
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
# From composer, "require-dev": {
# "laminas/laminas-coding-standard": "~2.3.0",
# "laminas/laminas-crypt": "^2.6 || ^3.2.1",
@@ -64,7 +65,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-ldap) >= 2.12
BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
-# remirepo:11
+# remirepo:12
%else
BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-zendframework-bridge
@@ -75,6 +76,7 @@ BuildRequires: php-laminas-ldap
BuildRequires: php-laminas-session
BuildRequires: php-laminas-uri
BuildRequires: php-laminas-validator
+BuildRequires: php-laminas-servicemanager
%endif
%global phpunit %{_bindir}/phpunit9
BuildRequires: phpunit9 >= 9.3
@@ -91,6 +93,7 @@ Requires: php(language) >= 7.3
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
# From composer, "suggest": {
# "laminas/laminas-crypt": "Laminas\\Crypt component",
# "laminas/laminas-db": "Laminas\\Db component",
@@ -106,10 +109,11 @@ Suggests: php-autoloader(%{gh_owner}/laminas-ldap)
Suggests: php-autoloader(%{gh_owner}/laminas-session)
Suggests: php-autoloader(%{gh_owner}/laminas-uri)
Suggests: php-autoloader(%{gh_owner}/laminas-validator)
-# remirepo:4
+# remirepo:5
%else
Requires: php-laminas-stdlib
Requires: php-laminas-zendframework-bridge
+Requires: php-laminas-servicemanager
%endif
%endif
# Autoloader
@@ -151,6 +155,7 @@ mv LICENSE.md LICENSE
phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
+ '%{php_home}/%{namespace}/ServiceManager/autoload.php',
'%{php_home}/%{namespace}/Stdlib/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
@@ -225,6 +230,10 @@ exit $ret
%changelog
+* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 2.11.0-2
+- add dependency on laminas-servicemanager to workaround
+ issue with old psr/container
+
* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 2.11.0-1
- update to 2.11.0