From af648754feb4c84b803282fe22d342c4b788dddd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Jan 2020 15:37:24 +0100 Subject: switch to Laminas --- composer.json | 54 ++++++++++--------- php-laminas-mime.spec | 145 +++++++++++++++++++++++++++++++------------------- 2 files changed, 120 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index 3911429..cd4f45f 100644 --- a/composer.json +++ b/composer.json @@ -1,49 +1,50 @@ { - "name": "zendframework/zend-mime", + "name": "laminas/laminas-mime", "description": "Create and parse MIME messages and parts", "license": "BSD-3-Clause", "keywords": [ - "zendframework", - "zf", + "laminas", "mime" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-mime/", - "issues": "https://github.com/zendframework/zend-mime/issues", - "source": "https://github.com/zendframework/zend-mime", - "rss": "https://github.com/zendframework/zend-mime/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-mime/", + "issues": "https://github.com/laminas/laminas-mime/issues", + "source": "https://github.com/laminas/laminas-mime", + "rss": "https://github.com/laminas/laminas-mime/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "zendframework/zend-mail": "^2.6", - "phpunit/phpunit": "^5.7.21 || ^6.3", - "zendframework/zend-coding-standard": "~1.0.0" + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-mail": "^2.6", + "phpunit/phpunit": "^5.7.21 || ^6.3" }, "suggest": { - "zendframework/zend-mail": "Zend\\Mail component" + "laminas/laminas-mail": "Laminas\\Mail component" }, "autoload": { "psr-4": { - "Zend\\Mime\\": "src/" + "Laminas\\Mime\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Mime\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "LaminasTest\\Mime\\": "test/" } }, "scripts": { @@ -55,5 +56,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-mime": "self.version" } } diff --git a/php-laminas-mime.spec b/php-laminas-mime.spec index 0a4ced6..1865785 100644 --- a/php-laminas-mime.spec +++ b/php-laminas-mime.spec @@ -1,31 +1,30 @@ -# remirepo/Fedora spec file for php-zendframework-zend-mime +# remirepo/Fedora spec file for php-laminas-mime # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit c91e0350be53cc9d29be15563445eec3b269d7c1 +# When build without laminas-mail +%global bootstrap 1 +%global gh_commit 2dbace2c69542e5a251af3becb6d7209ac9fb42b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-mime +%global gh_owner laminas +%global gh_project laminas-mime +%global zf_name zend-mime %global php_home %{_datadir}/php +%global namespace Laminas %global library Mime -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else %global with_tests 0%{!?_without_tests:1} -%endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.7.2 -Release: 2%{?dist} -Summary: Zend Framework %{library} component +Release: 1%{?dist} +Summary: %{namespace} Framework %{library} component License: BSD -URL: https://zendframework.github.io/%{gh_project}/ +URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -37,63 +36,69 @@ BuildRequires: php-iconv BuildRequires: php-pcre BuildRequires: php-spl # From composer, "require-dev": { -# "zendframework/zend-mail": "^2.6"", -# "phpunit/phpunit": "^5.7.21 || ^6.3", -# "zendframework/zend-coding-standard": "~1.0.0" +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-mail": "^2.6", +# "phpunit/phpunit": "^5.7.21 || ^6.3" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -BuildRequires: (php-composer(%{gh_owner}/zend-mail) >= 2.6 with php-composer(%{gh_owner}/zend-mail) < 3) -# remirepo:6 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +%if ! %{bootstrap} +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mail) >= 2.6 with php-autoloader(%{gh_owner}/laminas-mail) < 3) +%endif +# remirepo:7 %else -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -BuildRequires: php-composer(%{gh_owner}/zend-mail) < 3 -BuildRequires: php-composer(%{gh_owner}/zend-mail) >= 2.6 +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-zendframework-bridge +%if ! %{bootstrap} +BuildRequires: php-laminas-mail +%endif %endif %global phpunit %{_bindir}/phpunit6 BuildRequires: %{phpunit} -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif +# Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" +# "laminas/laminas-stdlib": "^2.7 || ^3.0", +# "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 -%if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +# From composer, "suggest": { +# "laminas/laminas-mail": "Laminas\\Mail component" +Suggests: php-composer(%{gh_owner}/laminas-mail) # remirepo:4 %else -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -%endif -# From composer, "suggest": { -# "zendframework/zend-mail": "Zend\\Mail component" -Suggests: php-composer(%{gh_owner}/zend-mail) +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.1 +# From phpcompatinfo report for version 2.7.2 Requires: php-iconv Requires: php-pcre Requires: php-spl -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.7.2-99 +Provides: php-zendframework-%{zf_name} = %{version}-99 +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} %description -Zend\Mime is a support class for handling multipart MIME messages. -It is used by Zend\Mail and Zend\Mime\Message and may be used by +%{namespace}\Mime is a support class for handling multipart MIME messages. +It is used by %{namespace}\Mail and %{namespace}\Mime\Message and may be used by applications requiring MIME support. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -107,17 +112,31 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Zend/Stdlib/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/Mail/autoload.php', + '%{php_home}/%{namespace}/Mail/autoload.php', +]); +EOF + +cat << 'EOF' | tee zf.php + - 2.7.2-1 +- switch to Laminas +- bootstrap build without mail + * Thu Oct 17 2019 Remi Collet - 2.7.2-1 - update to 2.7.2 -- cgit