summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-laminas-form.spec15
2 files changed, 11 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index 9fad7b9..f0d3855 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.14.x-dev",
- "dev-develop": "2.15.x-dev"
+ "dev-master": "2.15.x-dev",
+ "dev-develop": "2.16.x-dev"
},
"laminas": {
"component": "Laminas\\Form",
diff --git a/php-laminas-form.spec b/php-laminas-form.spec
index 4424922..ea3b5fb 100644
--- a/php-laminas-form.spec
+++ b/php-laminas-form.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit c19b62ed8394bcf2038ab3f51a49b7d0ef4e1700
+%global gh_commit 359cd372c565e18a17f32ccfeacdf21bba091ce2
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-form
@@ -16,13 +16,13 @@
%global namespace Laminas
%global library Form
%if %{bootstrap}
-%global with_tests 0%{?_with_tests:1}
+%bcond_with tests
%else
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
%endif
Name: php-%{gh_project}
-Version: 2.14.6
+Version: 2.15.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -33,7 +33,7 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
BuildRequires: php(language) >= 5.6
BuildRequires: php-date
BuildRequires: php-intl
@@ -228,7 +228,7 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
%check
-%if %{with_tests}
+%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
@@ -277,6 +277,9 @@ exit $ret
%changelog
+* Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 2.15.0-1
+- update to 2.15.0
+
* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 2.14.6-1
- update to 2.14.6