summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json21
-rw-r--r--php-laminas-captcha.spec46
2 files changed, 35 insertions, 32 deletions
diff --git a/composer.json b/composer.json
index f48becd..6bd5b52 100644
--- a/composer.json
+++ b/composer.json
@@ -16,30 +16,29 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
- "sort-packages": true
+ "sort-packages": true,
+ "platform": {
+ "php": "7.3.99"
+ }
},
"extra": {},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-math": "^2.7 || ^3.0",
- "laminas/laminas-stdlib": "^3.6"
- },
- "require-dev": {
- "laminas/laminas-coding-standard": "~2.1.4",
"laminas/laminas-recaptcha": "^3.0",
"laminas/laminas-session": "^2.12",
+ "laminas/laminas-stdlib": "^3.6",
"laminas/laminas-text": "^2.8",
- "laminas/laminas-validator": "^2.14",
+ "laminas/laminas-validator": "^2.14"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~2.1.4",
"phpunit/phpunit": "^9.4.3",
"psalm/plugin-phpunit": "^0.15.1",
"vimeo/psalm": "^4.6"
},
"suggest": {
- "laminas/laminas-i18n-resources": "Translations of captcha messages",
- "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
- "laminas/laminas-session": "Laminas\\Session component",
- "laminas/laminas-text": "Laminas\\Text component",
- "laminas/laminas-validator": "Laminas\\Validator component"
+ "laminas/laminas-i18n-resources": "Translations of captcha messages"
},
"autoload": {
"psr-4": {
diff --git a/php-laminas-captcha.spec b/php-laminas-captcha.spec
index 8fa5c44..47dd780 100644
--- a/php-laminas-captcha.spec
+++ b/php-laminas-captcha.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-captcha
#
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 6b0b98d388b713119cbb5788ea0b90cd6e63513a
+%global gh_commit b07e499a7df73795768aa89e0138757a7ddb9195
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-captcha
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.11.0
+Version: 2.12.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -41,21 +41,17 @@ BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-math) >= 2.7 with php-autoloader(%{gh_owner}/laminas-math) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.8 with php-autoloader(%{gh_owner}/laminas-text) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
# "laminas/laminas-coding-standard": "~2.1.4",
-# "laminas/laminas-recaptcha": "^3.0",
-# "laminas/laminas-session": "^2.12",
-# "laminas/laminas-text": "^2.8",
-# "laminas/laminas-validator": "^2.14",
# "phpunit/phpunit": "^9.4.3",
# "psalm/plugin-phpunit": "^0.15.1",
# "vimeo/psalm": "^4.6"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.8 with php-autoloader(%{gh_owner}/laminas-text) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
# remirepo:9
%else
BuildRequires: php-laminas-math
@@ -75,20 +71,24 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^7.3 || ~8.0.0 || ~8.1.0",
# "laminas/laminas-math": "^2.7 || ^3.0",
-# "laminas/laminas-stdlib": "^3.6"
+# "laminas/laminas-recaptcha": "^3.0",
+# "laminas/laminas-session": "^2.12",
+# "laminas/laminas-stdlib": "^3.6",
+# "laminas/laminas-text": "^2.8",
+# "laminas/laminas-validator": "^2.14"
Requires: php(language) >= 7.3
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/laminas-math) >= 2.7 with php-autoloader(%{gh_owner}/laminas-math) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-recaptcha) >= 3.0 with php-autoloader(%{gh_owner}/laminas-recaptcha) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3)
Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-text) >= 2.8 with php-autoloader(%{gh_owner}/laminas-text) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.14 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-i18n-resources": "Translations of captcha messages",
-# "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
-# "laminas/laminas-session": "Laminas\\Session component",
-# "laminas/laminas-text": "Laminas\\Text component",
-# "laminas/laminas-validator": "Laminas\\Validator component"
Suggests: php-autoloader(%{gh_owner}/laminas-i18n-resources)
Suggests: php-autoloader(%{gh_owner}/laminas-recaptcha)
Suggests: php-autoloader(%{gh_owner}/laminas-session)
@@ -143,14 +143,14 @@ phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/%{namespace}/Math/autoload.php',
+ '%{php_home}/%{namespace}/ReCaptcha/autoload.php',
+ '%{php_home}/%{namespace}/Session/autoload.php',
'%{php_home}/%{namespace}/Stdlib/autoload.php',
+ '%{php_home}/%{namespace}/Text/autoload.php',
+ '%{php_home}/%{namespace}/Validator/autoload.php',
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/I18n/Translator/autoload.php',
- '%{php_home}/%{namespace}/Session/autoload.php',
- '%{php_home}/%{namespace}/Text/autoload.php',
- '%{php_home}/%{namespace}/Validator/autoload.php',
- '%{php_home}/%{namespace}/ReCaptcha/autoload.php',
]);
EOF
@@ -193,7 +193,7 @@ exit (class_exists("\\Zend\\%{library}\\Image") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -216,6 +216,10 @@ exit $ret
%changelog
+* Thu Apr 7 2022 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0 (no change)
+- add mandatory dependencies on recaptcha, session, text and validator
+
* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1
- update to 2.11.0
- keep compatibility using laminas-zendframework-bridge
generated by cgit (git 2.34.1) at 2024-11-22 02:39:18 +0000