diff options
| -rw-r--r-- | php-laminas-diactoros2.spec | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/php-laminas-diactoros2.spec b/php-laminas-diactoros2.spec index c57c32b..5d639d7 100644 --- a/php-laminas-diactoros2.spec +++ b/php-laminas-diactoros2.spec @@ -10,8 +10,7 @@ %global gh_owner laminas %global gh_project laminas-diactoros -%global zf_name zend-diactoros -%global gh_commit 4ff7400c1c12e404144992ef43c8b733fd9ad516 +%global gh_commit 53df7b7cd66e0905e6133970a4b90392a7a08075 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global php_home %{_datadir}/php %global namespace Laminas @@ -37,8 +36,8 @@ %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{gh_project}%{major} -Version: 2.5.0 -Release: 2%{?gh_release}%{?dist} +Version: 2.5.1 +Release: 1%{?gh_release}%{?dist} Summary: PSR HTTP Message implementations v%{major} License: BSD @@ -127,11 +126,8 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) -# Compatibily ensure by the bridge Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} -Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} -Provides: php-autoloader(zendframework/%{zf_name}) = %{version} Provides: php-composer(psr/http-factory-implementation) = 1.0 Provides: php-composer(psr/http-message-implementation) = 1.0 @@ -178,36 +174,12 @@ if (!function_exists('Laminas\\Diactoros\\createUploadedFile')) { } AUTOLOAD -cat << 'EOF' | tee zf.php -<?php -require_once '%{php_home}/Fedora/Autoloader/autoload.php'; -$dir = dirname(dirname(__DIR__)) . '/%{namespace}/%{library}%{major}'; -if (!function_exists('Zend\\Diactoros\\createUploadedFile')) { - \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', - $dir . '/autoload.php', - $dir . '/functions/create_uploaded_file.legacy.php', - $dir . '/functions/marshal_headers_from_sapi.legacy.php', - $dir . '/functions/marshal_method_from_sapi.legacy.php', - $dir . '/functions/marshal_protocol_version_from_sapi.legacy.php', - $dir . '/functions/marshal_uri_from_sapi.legacy.php', - $dir . '/functions/normalize_server.legacy.php', - $dir . '/functions/normalize_uploaded_files.legacy.php', - $dir . '/functions/parse_cookie_header.legacy.php', - ]); -} -EOF - %install : Laminas library mkdir -p %{buildroot}%{php_home}/%{namespace}/ cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}%{major} -: Zend equiv -mkdir -p %{buildroot}%{php_home}/Zend/%{library}%{major} -cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php - %check %if %{with tests} @@ -240,12 +212,6 @@ for CMDARG in "php %{phpunit}" php73 php74 php80; do fi done -: check compat autoloader -php -r ' -require "%{buildroot}%{php_home}/Zend/%{library}%{major}/autoload.php"; -exit (class_exists("\\Zend\\%{library}\\Request") ? 0 : 1); -' - exit $RETURN_CODE %else : Tests skipped @@ -256,14 +222,16 @@ exit $RETURN_CODE # remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE COPYRIGHT.md -%doc CHANGELOG.md %doc README.md %doc composer.json -%{php_home}/Zend/%{library}%{major} %{php_home}/%{namespace}/%{library}%{major} %changelog +* Wed Apr 14 2021 Remi Collet <remi@remirepo.net> - 2.5.1-1 +- update to 2.5.1 (no change) +- drop ZF compatibility + * Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 2.5.0-2 - fix test suite path, from review #1900513 |