summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json7
-rw-r--r--php-laminas-crypt.spec12
2 files changed, 11 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index f28aa31..bd982d3 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,7 @@
"ext-mbstring": "*",
"container-interop/container-interop": "^1.2",
"laminas/laminas-math": "^3.4",
- "laminas/laminas-stdlib": "^3.6",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "laminas/laminas-stdlib": "^3.6"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
@@ -56,7 +55,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
- "replace": {
- "zendframework/zend-crypt": "^3.3.1"
+ "conflict": {
+ "zendframework/zend-crypt": "*"
}
}
diff --git a/php-laminas-crypt.spec b/php-laminas-crypt.spec
index ad7980e..443e0b3 100644
--- a/php-laminas-crypt.spec
+++ b/php-laminas-crypt.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 026fe31aa5c9d68679267e5473d64d96f4576020
+%global gh_commit ad2c29c289a4bc837b37a7650f5178edda0fc548
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-crypt
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 3.5.1
+Version: 3.6.0
Release: 1%{?dist}
Summary: Laminas Framework %{library} component
@@ -68,8 +68,7 @@ BuildRequires: php-fedora-autoloader-devel
# "ext-mbstring": "*",
# "container-interop/container-interop": "^1.2",
# "laminas/laminas-math": "^3.4",
-# "laminas/laminas-stdlib": "^3.6",
-# "laminas/laminas-zendframework-bridge": "^1.0"
+# "laminas/laminas-stdlib": "^3.6"
Requires: php(language) >= 7.3
Requires: php-mbstring
%if ! %{bootstrap}
@@ -213,6 +212,11 @@ exit $ret
%changelog
+* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0 (no change)
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 3.5.1-1
- update to 3.5.1
- raise dependency on laminas-math 3.4