From 28a54778d45b008a2172b21aa281449c911e3176 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jan 2020 16:54:58 +0100 Subject: switch to Laminas add patch to fix test suite from https://github.com/laminas/laminas-math/pull/2 --- php-laminas-math.spec | 120 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 47 deletions(-) (limited to 'php-laminas-math.spec') diff --git a/php-laminas-math.spec b/php-laminas-math.spec index d3f76df..e31dc7d 100644 --- a/php-laminas-math.spec +++ b/php-laminas-math.spec @@ -1,17 +1,19 @@ -# remirepo/Fedora spec file for php-zendframework-zend-math +# remirepo/Fedora spec file for php-laminas-math # -# 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 07e43d87fd5c7edc4f54121b9a4625eb10e4b726 +%global gh_commit dd603c7d151d46eafd243a405d5b7eefa4222d74 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-math +%global gh_owner laminas +%global gh_project laminas-math +%global zf_name zend-math %global php_home %{_datadir}/php +%global namespace Laminas %global library Math %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -19,42 +21,43 @@ %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 3.2.0 Release: 1%{?dist} -Summary: Zend Framework %{library} component +Summary: Laminas 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 +Patch0: https://patch-diff.githubusercontent.com/raw/laminas/laminas-math/pull/2.patch + BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +BuildRequires: php-mbstring +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +BuildRequires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) +# remirepo:3 +%else +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-paragonie-random-compat >= 2.0.11 +%endif BuildRequires: php-bcmath BuildRequires: php-gmp -BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-spl # test suite hangs without (need investigation) BuildRequires: php-mcrypt # From composer, "require-dev": { -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", -# "zendframework/zend-coding-standard": "~1.0.0" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) +# "laminas/laminas-coding-standard": "~1.0.0", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1.2 -# remirepo:6 -%else -BuildRequires: php-composer(paragonie/random_compat) < 3 -BuildRequires: php-composer(paragonie/random_compat) >= 2.0.11 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5.8 -%endif # Autoloader BuildRequires: php-fedora-autoloader-devel %endif @@ -62,19 +65,20 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", # "ext-mbstring": "*", +# "laminas/laminas-zendframework-bridge": "^1.0", # "paragonie/random_compat": "^2.0.11 || 9.99.99" Requires: php(language) >= 5.6 Requires: php-mbstring # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) +Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +Requires: (php-composer(paragonie/random_compat) >= 2.0.11 with php-composer(paragonie/random_compat) < 3) # remirepo:4 %else -Requires: php-composer(paragonie/random_compat) < 3 -Requires: php-composer(paragonie/random_compat) >= 2.0.11 +Requires: php-laminas-zendframework-bridge +Requires: php-paragonie-random-compat >= 2.0.11 %endif -# From phpcompatinfo report for version 3.1.0 -Requires: php-mbstring +# From phpcompatinfo report for version 3.2.0 Requires: php-pcre Requires: php-spl %if ! %{bootstrap} @@ -87,33 +91,32 @@ Requires: php-gmp Requires: php-composer(fedora/autoloader) %endif -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} < 3.2.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\Math provides general mathematical functions. +%{gh_project} provides general mathematical functions. So far the supported functionalities are: -* Zend\Math\Rand, a random number generator; -* Zend\Math\BigInteger, a library to manage big integers. +* Laminas\Math\Rand, a random number generator; +* Laminas\Math\BigInteger, a library to manage big integers. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .pr2 mv LICENSE.md LICENSE -%build -: Create dependency autoloader - deprecated -cat << 'EOF' | tee autoload.php - - 3.2.0-1 +- switch to Laminas +- add patch to fix test suite from + https://github.com/laminas/laminas-math/pull/2 + * Tue Dec 11 2018 Remi Collet - 3.2.0-1 - update to 3.2.0 (no change) -- cgit