summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-laminas-form.spec19
2 files changed, 13 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index f0d3855..54f2ad6 100644
--- a/composer.json
+++ b/composer.json
@@ -19,10 +19,6 @@
"sort-packages": true
},
"extra": {
- "branch-alias": {
- "dev-master": "2.15.x-dev",
- "dev-develop": "2.16.x-dev"
- },
"laminas": {
"component": "Laminas\\Form",
"config-provider": "Laminas\\Form\\ConfigProvider"
diff --git a/php-laminas-form.spec b/php-laminas-form.spec
index ea3b5fb..cc9f02e 100644
--- a/php-laminas-form.spec
+++ b/php-laminas-form.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-form
#
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 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 359cd372c565e18a17f32ccfeacdf21bba091ce2
+%global gh_commit 37c5f5ac9240159f5d93f52367d0e57fa96f9b22
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-form
@@ -15,14 +15,15 @@
%global php_home %{_datadir}/php
%global namespace Laminas
%global library Form
-%if %{bootstrap}
+%if 0%{?fedora} >= 35
+# Not compatible with PHP 8
%bcond_with tests
%else
%bcond_without tests
%endif
Name: php-%{gh_project}
-Version: 2.15.0
+Version: 2.15.1
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -43,7 +44,7 @@ BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-inputfilter) >= 2.8 with php-autoloader(%{gh_owner}/laminas-inputfilter) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 1.1 with php-autoloader(%{gh_owner}/laminas-hydrator) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 3 with php-autoloader(%{gh_owner}/laminas-hydrator) < 4)
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)
# From composer, "require-dev": {
@@ -232,6 +233,7 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
+require_once '%{php_home}/%{namespace}/Hydrator3/autoload.php';
require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
\Fedora\Autoloader\Dependencies::required([
@@ -254,7 +256,8 @@ exit (class_exists("\\Zend\\%{library}\\Factory") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+# TODO php80
+for cmdarg in "php %{phpunit}" php73 php74; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit7} -d memory_limit=1G || ret=1
@@ -277,6 +280,10 @@ exit $ret
%changelog
+* Thu Mar 18 2021 Remi Collet <remi@remirepo.net> - 2.15.1-1
+- update to 2.15.1
+- temporarily disable test suite with PHP 8
+
* Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 2.15.0-1
- update to 2.15.0