diff options
| author | Remi Collet <remi@remirepo.net> | 2020-01-17 14:33:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-01-17 14:33:24 +0100 |
| commit | 37a6d0a83cd07372c31dc0a5b037d05fc1c58a4a (patch) | |
| tree | 713b9b559deeda469e627bfe5f5eb391294c563d | |
| parent | c5ca909ec24da3fd2c2e4102dad92f33656f3a3a (diff) | |
cleanup
| -rw-r--r-- | php-laminas-json.spec | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/php-laminas-json.spec b/php-laminas-json.spec index ec2ec18..1ae13a9 100644 --- a/php-laminas-json.spec +++ b/php-laminas-json.spec @@ -23,7 +23,7 @@ Name: php-%{gh_project} Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Laminas Framework %{library} component License: BSD @@ -70,18 +70,14 @@ Requires: php(language) >= 5.6 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) -# remirepo:3 -%else -Requires: php-laminas-zendframework-bridge -%endif -%if ! %{bootstrap} # From composer, "suggest": { # "laminas/laminas-json-server": "For implementing JSON-RPC servers", # "laminas/laminas-xml2json": "For converting XML documents to JSON" -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-composer(%{gh_owner}/laminas-json-server) Suggests: php-composer(%{gh_owner}/laminas-xml2json) -%endif +# remirepo:3 +%else +Requires: php-laminas-zendframework-bridge %endif # From phpcompatinfo report for version 3.1.2 Requires: php-json @@ -92,6 +88,9 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) +# remirepo:2 +Obsoletes: php-ZendFramework2-%{library} < 2.5 +Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge Obsoletes: php-zendframework-%{zf_name} < 3.1.2-99 Provides: php-zendframework-%{zf_name} = %{version}-99 @@ -165,7 +164,7 @@ done : check compat autoloader php -r ' require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php"; -return (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1); +exit (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1); ' exit $ret @@ -184,6 +183,9 @@ exit $ret %changelog +* Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 3.1.2-2 +- cleanup + * Tue Jan 7 2020 Remi Collet <remi@remirepo.net> - 3.1.2-1 - switch to Laminas |