summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-06-24 08:19:57 +0200
committerRemi Collet <remi@remirepo.net>2020-06-24 08:19:57 +0200
commit4886d9e6c5b9374206ff68aede82796967da2141 (patch)
tree38dfe594fe45bff2f5ff42e1447d11017dac51c3
parent9d4fdd07c6c7e902a860868e95e06ecede61ba34 (diff)
update to 2.12.0HEADmaster
-rw-r--r--composer.json6
-rw-r--r--php-laminas-http.spec13
2 files changed, 11 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index a82627c..e7f5637 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
}
},
"require": {
@@ -62,6 +62,6 @@
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
- "zendframework/zend-http": "self.version"
+ "zendframework/zend-http": "^2.11.2"
}
}
diff --git a/php-laminas-http.spec b/php-laminas-http.spec
index c14e779..c11ca8b 100644
--- a/php-laminas-http.spec
+++ b/php-laminas-http.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 8c66963b933c80da59433da56a44dfa979f3ec88
+%global gh_commit 48bd06ffa3a6875e2b77d6852405eb7b1589d575
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-http
@@ -22,8 +22,8 @@
%endif
Name: php-%{gh_project}
-Version: 2.11.2
-Release: 2%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
License: BSD
@@ -111,8 +111,8 @@ Requires: php-zlib
Obsoletes: php-ZendFramework2-%{library} < 2.5
Provides: php-ZendFramework2-%{library} = %{version}
# Compatibily ensure by the bridge
-Obsoletes: php-zendframework-%{zf_name} < 2.11.2-99
-Provides: php-zendframework-%{zf_name} = %{version}-99
+Obsoletes: php-zendframework-%{zf_name} < 2.11.3
+Provides: php-zendframework-%{zf_name} = %{version}
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
Provides: php-composer(zendframework/%{zf_name}) = %{version}
Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -214,6 +214,9 @@ exit $ret
%changelog
+* Wed Jun 24 2020 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0
+
* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.11.2-2
- cleanup