From da4a6146ec4171b8edc46121824a2bc87c603d79 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jan 2020 10:55:38 +0100 Subject: switch to Laminas --- composer.json | 54 +++++++++-------- php-laminas-barcode.spec | 151 ++++++++++++++++++++++++++++++----------------- 2 files changed, 127 insertions(+), 78 deletions(-) diff --git a/composer.json b/composer.json index f9696bf..22cf779 100644 --- a/composer.json +++ b/composer.json @@ -1,30 +1,40 @@ { - "name": "zendframework/zend-barcode", + "name": "laminas/laminas-barcode", "description": "Programmatically create and render barcodes as images or in PDFs", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "barcode" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-barcode/", - "issues": "https://github.com/zendframework/zend-barcode/issues", - "source": "https://github.com/zendframework/zend-barcode", - "rss": "https://github.com/zendframework/zend-barcode/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-barcode/", + "issues": "https://github.com/laminas/laminas-barcode/issues", + "source": "https://github.com/laminas/laminas-barcode", + "rss": "https://github.com/laminas/laminas-barcode/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" + } }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1", - "zendframework/zend-validator": "^2.10.1" + "laminas/laminas-servicemanager": "^2.7.8 || ^3.3", + "laminas/laminas-stdlib": "^2.7.7 || ^3.1", + "laminas/laminas-validator": "^2.10.1", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-config": "^2.6 || ^3.1", "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.6 || ^3.1", "zendframework/zendpdf": "^2.0.2" }, "suggest": { @@ -32,21 +42,12 @@ }, "autoload": { "psr-4": { - "Zend\\Barcode\\": "src/" + "Laminas\\Barcode\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Barcode\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "2.9.x-dev" + "LaminasTest\\Barcode\\": "test/" } }, "scripts": { @@ -58,5 +59,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-barcode": "self.version" } } diff --git a/php-laminas-barcode.spec b/php-laminas-barcode.spec index afdf574..e9e7e62 100644 --- a/php-laminas-barcode.spec +++ b/php-laminas-barcode.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-barcode +# remirepo/Fedora spec file for php-laminas-barcode # # Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA @@ -7,11 +7,13 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 6db95687997920b8217e71d2f12b51ec10e824d9 +%global gh_commit 35fb88fd487324fd6fb6bb5c5385239ba023be64 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-barcode +%global gh_owner laminas +%global gh_project laminas-barcode +%global zf_name zend-barcode %global php_home %{_datadir}/php +%global namespace Laminas %global library Barcode %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -19,13 +21,13 @@ %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.8.0 Release: 1%{?dist} -Summary: Zend Framework %{library} component +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 @@ -35,75 +37,92 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 + BuildRequires: php-dom BuildRequires: php-gd BuildRequires: php-iconv BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-config": "^2.6 || ^3.1", # "phpunit/phpunit": "^5.7.23 || ^6.4.3", -# "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-config": "^2.6 || ^3.1", # "zendframework/zendpdf": "^2.0.2" -BuildRequires: php-autoloader(%{gh_owner}/zend-config) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zendpdf) >= 2.0.2 -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.4.3 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 4) +BuildRequires: (php-autoloader(zendframework/zendpdf) >= 2.0.2 with php-autoloader(zendframework/zendpdf) < 3) +# remirepo:8 %else -%global phpunit %{_bindir}/phpunit -BuildRequires: php-composer(phpunit/phpunit) >= 5.7.22 +BuildRequires: php-laminas-servicemanager +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-validator +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-laminas-config +BuildRequires: php-zendframework-zendpdf %endif -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.4.3 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", -# "zendframework/zend-stdlib": "^2.7.7 || ^3.1", -# "zendframework/zend-validator": "^2.10.1" +# "laminas/laminas-servicemanager": "^2.7.8 || ^3.3", +# "laminas/laminas-stdlib": "^2.7.7 || ^3.1", +# "laminas/laminas-validator": "^2.10.1", +# "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 -%if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.8 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 -Requires: php-autoloader(%{gh_owner}/zend-validator) < 3 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { # "zendframework/zendpdf": "ZendPdf component" -%if 0%{?fedora} >= 21 -Suggests: php-autoloader(%{gh_owner}/zendpdf) -%endif +Suggests: php-autoloader(zendframework/zendpdf) +# remirepo:6 +%else +Requires: php-laminas-servicemanager +Requires: php-laminas-stdlib +Requires: php-laminas-validator +Requires: php-laminas-zendframework-bridge %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.6.0 +# From phpcompatinfo report for version 2.8.0 Requires: php-dom Requires: php-gd 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} +# remirepo:2 +Obsoletes: php-ZendFramework2-%{library} < 2.5 +Provides: php-ZendFramework2-%{library} = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.8.0-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\Barcode provides a generic way to generate barcodes. -The Zend\Barcode component is divided into two subcomponents: barcode objects -and renderers. Objects allow you to create barcodes independently of the -renderer. Renderer allow you to draw barcodes based on the support required. +%{namespace}\Barcode provides a generic way to generate barcodes. +The %{namespace}\Barcode component is divided into two subcomponents: +barcode objects and renderers. Objects allow you to create barcodes +independently of the renderer. Renderer allow you to draw barcodes based +on the support required. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -118,19 +137,33 @@ 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}/Zend/Validator/autoload.php', - '%{php_home}/Zend/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', + '%{php_home}/%{namespace}/Validator/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/ZendPdf/autoload.php', ]); EOF +cat << 'EOF' | tee zf.php + - 2.8.0-1 +- switch to Laminas + * Thu Jan 2 2020 Remi Collet - 2.8.0-1 - update to 2.8.0 - add patch for PHP 7.4 from -- cgit