summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-laminas-diactoros2.spec15
2 files changed, 9 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 4017937..0330d7a 100644
--- a/composer.json
+++ b/composer.json
@@ -22,10 +22,6 @@
"sort-packages": true
},
"extra": {
- "branch-alias": {
- "dev-master": "2.3.x-dev",
- "dev-develop": "2.4.x-dev"
- },
"laminas": {
"config-provider": "Laminas\\Diactoros\\ConfigProvider",
"module": "Laminas\\Diactoros"
diff --git a/php-laminas-diactoros2.spec b/php-laminas-diactoros2.spec
index d29c203..85aee59 100644
--- a/php-laminas-diactoros2.spec
+++ b/php-laminas-diactoros2.spec
@@ -11,7 +11,7 @@
%global gh_owner laminas
%global gh_project laminas-diactoros
%global zf_name zend-diactoros
-%global gh_commit 2ffc7cc816f6207b27923ee15edf6fac668390aa
+%global gh_commit 2580100a0d798c4452e9351847febdf76352130c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global php_home %{_datadir}/php
%global namespace Laminas
@@ -32,12 +32,12 @@
%global gh_factory_short %(c=%{gh_factory_commit}; echo ${c:0:7})
# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
%{!?phpdir: %global phpdir %{_datadir}/php}
Name: php-%{gh_project}%{major}
-Version: 2.3.1
+Version: 2.4.0
Release: 1%{?gh_release}%{?dist}
Summary: PSR HTTP Message implementations v%{major}
@@ -57,7 +57,7 @@ Source5: php-%{gh_factory_owner}-%{gh_factory_name}-get-source.sh
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
## composer.json
BuildRequires: php(language) >= 7.1
# remirepo:1
@@ -205,7 +205,7 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php
%check
-%if %{with_tests}
+%if %{with tests}
: Create tests bootstrap
cat <<'BOOTSTRAP' | tee bootstrap.php
<?php
@@ -219,7 +219,7 @@ BOOTSTRAP
: Upstream tests
# Skip tests requiring network access
RETURN_CODE=0
-for CMDARG in "php %{phpunit}" php72 php73 php74 php80; do
+for CMDARG in "php %{phpunit}" php72 php73 php74; do
if which $CMDARG; then
set $CMDARG
$1 ${2:-%{_bindir}/phpunit7} \
@@ -252,6 +252,9 @@ exit $RETURN_CODE
%changelog
+* Thu Sep 3 2020 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+
* Wed Jul 8 2020 Remi Collet <remi@remirepo.net> - 2.3.1-1
- update to 2.3.1