From df1f70180454483dfde9e6e5f604162625ff2ca1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Nov 2017 07:06:20 +0100 Subject: switch --- composer-dev.json | 41 ------- composer.json | 12 +-- php-zendframework-zend-math-dev.spec | 192 --------------------------------- php-zendframework-zend-math-pr24.patch | 31 ------ php-zendframework-zend-math.spec | 77 ++++++++----- 5 files changed, 55 insertions(+), 298 deletions(-) delete mode 100644 composer-dev.json delete mode 100644 php-zendframework-zend-math-dev.spec delete mode 100644 php-zendframework-zend-math-pr24.patch diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index 804ba67..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "zendframework/zend-math", - "description": " ", - "license": "BSD-3-Clause", - "keywords": [ - "zf2", - "math" - ], - "homepage": "https://github.com/zendframework/zend-math", - "autoload": { - "psr-4": { - "Zend\\Math\\": "src/" - } - }, - "require": { - "php": "^5.5 || ^7.0", - "ext-mbstring": "*", - "paragonie/random_compat": "^2.0.2" - }, - "suggest": { - "ext-bcmath": "If using the bcmath functionality", - "ext-gmp": "If using the gmp functionality" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "3.0-dev", - "dev-develop": "3.1-dev" - } - }, - "autoload-dev": { - "psr-4": { - "ZendTest\\Math\\": "test/" - } - }, - "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" - } -} diff --git a/composer.json b/composer.json index 1200ba4..804ba67 100644 --- a/composer.json +++ b/composer.json @@ -13,19 +13,20 @@ } }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.5 || ^7.0", + "ext-mbstring": "*", + "paragonie/random_compat": "^2.0.2" }, "suggest": { "ext-bcmath": "If using the bcmath functionality", - "ext-gmp": "If using the gmp functionality", - "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable" + "ext-gmp": "If using the gmp functionality" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "3.0-dev", + "dev-develop": "3.1-dev" } }, "autoload-dev": { @@ -35,7 +36,6 @@ }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "ircmaxell/random-lib": "~1.1", "phpunit/PHPUnit": "~4.0" } } diff --git a/php-zendframework-zend-math-dev.spec b/php-zendframework-zend-math-dev.spec deleted file mode 100644 index 08e12ee..0000000 --- a/php-zendframework-zend-math-dev.spec +++ /dev/null @@ -1,192 +0,0 @@ -# remirepo/Fedora spec file for php-zendframework-zend-math -# -# Copyright (c) 2015-2017 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 fda3b4e6c3bb15c35adc6db38b2eacabaa243e65 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-math -%global php_home %{_datadir}/php -%global library Math -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif - -Name: php-%{gh_owner}-%{gh_project} -Version: 3.0.0 -Release: 1%{?dist} -Summary: Zend Framework %{library} component - -Group: Development/Libraries -License: BSD -URL: https://zendframework.github.io/%{gh_project}/ -Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch -# Tests -%if %{with_tests} -BuildRequires: php(language) >= 5.5 -BuildRequires: php-bcmath -BuildRequires: php-gmp -BuildRequires: php-openssl -BuildRequires: php-pcre -BuildRequires: php-spl -BuildRequires: php-composer(paragonie/random_compat) -# test suite hangs without (need investigation) -BuildRequires: php-mcrypt -# From composer, "require-dev": { -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0", -# "zendframework/zend-servicemanager": "~2.5" -BuildRequires: php-composer(ircmaxell/random-lib) >= 1.1 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -# For dependencies autoloader -BuildRequires: php-zendframework-zend-loader >= 2.5.1-3 -%endif - -# From composer, "require": { -# "php": "^5.5 || ^7.0", -# "ext-mbstring": "*", -# "paragonie/random_compat": "^2.0.2" -Requires: php(language) >= 5.5 -Requires: php-mbstring -# ignore min version -Requires: php-composer(paragonie/random_compat) -# From phpcompatinfo report for version 2.5.2 -Requires: php-openssl -Requires: php-pcre -Requires: php-spl -Requires: php-zendframework-zend-loader >= 2.5.1-3 -%if ! %{bootstrap} -# From composer, "suggest": { -# "ext-bcmath": "If using the bcmath functionality", -# "ext-gmp": "If using the gmp functionality", -Requires: php-bcmath -Requires: php-gmp -# Autoloader -Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -%endif - -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -Zend\Math 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. - -Documentation: https://zendframework.github.io/%{gh_project}/ - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -mv LICENSE.md LICENSE - -: Create dependency autoloader -cat << 'EOF' | tee autoload.php - array( - 'namespaces' => array( - 'ZendTest\\%{library}' => dirname(__DIR__).'/test/', - 'Zend\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' -)))); -require_once '%{php_home}/Zend/autoload.php'; -EOF - -# remirepo:11 -run=0 -ret=0 -if which php56; then - php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if which php71; then - php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose -# remirepo:2 -fi -exit $ret -%else -: Test suite disabled -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license LICENSE -%doc *.md -%doc composer.json -%{php_home}/Zend/%{library} -%{php_home}/Zend/%{library}-autoload.php - - -%changelog -* Wed Jun 29 2016 Remi Collet - 3.0.0-1 -- update to 3.0.0 for ZendFramework 3 -- add dependencies autoloader -- add dependency on paragonie/random_compat -- drop dependency on ircmaxell/random-lib - -* Fri Apr 8 2016 Remi Collet - 2.7.0-1 -- update to 2.7.0 -- add mandatory dependency on ircmaxell/random-lib - -* Wed Feb 3 2016 Remi Collet - 2.6.0-1 -- update to 2.6.0 -- drop dependency on zend-servicemanager - -* Thu Dec 17 2015 Remi Collet - 2.5.2-1 -- update to 2.5.2 -- raise minimal php version to 5.5 - -* Tue Aug 4 2015 Remi Collet - 2.5.1-1 -- initial package diff --git a/php-zendframework-zend-math-pr24.patch b/php-zendframework-zend-math-pr24.patch deleted file mode 100644 index 15db9cb..0000000 --- a/php-zendframework-zend-math-pr24.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 16291e8a59c5791518eaaa7007e024ff2baed788 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 15 Sep 2016 15:09:10 +0200 -Subject: [PATCH] fix #23 missing method in HashTiming (RandomLib 1.2) - ---- - Source/HashTiming.php | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/Source/HashTiming.php b/Source/HashTiming.php -index a50ce43..63d2894 100644 ---- a/Source/HashTiming.php -+++ b/Source/HashTiming.php -@@ -62,6 +62,17 @@ public static function getStrength() - } - - /** -+ * If the source is currently available. -+ * Reasons might be because the library is not installed -+ * -+ * @return bool -+ */ -+ public static function isSupported() -+ { -+ return true; -+ } -+ -+ /** - * Generate a random string of the specified size - * - * @param int $size The size of the requested random string diff --git a/php-zendframework-zend-math.spec b/php-zendframework-zend-math.spec index 6034e22..08e12ee 100644 --- a/php-zendframework-zend-math.spec +++ b/php-zendframework-zend-math.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit f4358090d5d23973121f1ed0b376184b66d9edec +%global gh_commit fda3b4e6c3bb15c35adc6db38b2eacabaa243e65 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-math @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.0 -Release: 3%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,9 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -# https://github.com/zendframework/zend-math/pull/24 -Patch0: %{name}-pr24.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests @@ -43,37 +40,40 @@ BuildRequires: php-gmp BuildRequires: php-openssl BuildRequires: php-pcre BuildRequires: php-spl -%if 0%{?fedora} < 25 +BuildRequires: php-composer(paragonie/random_compat) # test suite hangs without (need investigation) BuildRequires: php-mcrypt -%endif # From composer, "require-dev": { # "fabpot/php-cs-fixer": "1.7.*", -# "ircmaxell/random-lib": "~1.1", # "phpunit/PHPUnit": "~4.0", # "zendframework/zend-servicemanager": "~2.5" BuildRequires: php-composer(ircmaxell/random-lib) >= 1.1 BuildRequires: php-composer(phpunit/phpunit) >= 4.0 # Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 +# For dependencies autoloader +BuildRequires: php-zendframework-zend-loader >= 2.5.1-3 %endif # From composer, "require": { -# "php": "^5.5 || ^7.0" +# "php": "^5.5 || ^7.0", +# "ext-mbstring": "*", +# "paragonie/random_compat": "^2.0.2" Requires: php(language) >= 5.5 +Requires: php-mbstring +# ignore min version +Requires: php-composer(paragonie/random_compat) # From phpcompatinfo report for version 2.5.2 Requires: php-openssl Requires: php-pcre Requires: php-spl +Requires: php-zendframework-zend-loader >= 2.5.1-3 %if ! %{bootstrap} # From composer, "suggest": { # "ext-bcmath": "If using the bcmath functionality", # "ext-gmp": "If using the gmp functionality", -# "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable" Requires: php-bcmath Requires: php-gmp -# Mandatory as we don't want mcrypt -Requires: php-composer(ircmaxell/random-lib) # Autoloader Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif @@ -89,12 +89,19 @@ So far the supported functionalities are: * Zend\Math\Rand, a random number generator; * Zend\Math\BigInteger, a library to manage big integers. +Documentation: https://zendframework.github.io/%{gh_project}/ + %prep %setup -q -n %{gh_project}-%{gh_commit} -cd src -%patch0 -p1 +mv LICENSE.md LICENSE + +: Create dependency autoloader +cat << 'EOF' | tee autoload.php + array( @@ -123,12 +134,22 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -# remirepo:3 +# remirepo:11 +run=0 +ret=0 +if which php56; then + php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 + run=1 +fi if which php71; then - php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} + php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 + run=1 +fi +if [ $run -eq 0 ]; then +%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose +# remirepo:2 fi +exit $ret %else : Test suite disabled %endif @@ -141,19 +162,19 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} -%license LICENSE.md -%doc CONTRIBUTING.md README.md +%license LICENSE +%doc *.md %doc composer.json %{php_home}/Zend/%{library} +%{php_home}/Zend/%{library}-autoload.php %changelog -* Tue Nov 15 2016 Remi Collet - 2.7.0-3 -- drop mcrypt build dependency - -* Thu Sep 15 2016 Remi Collet - 2.7.0-2 -- fix FTBFS detected by Koschei, patch from - https://github.com/zendframework/zend-math/pull/24 +* Wed Jun 29 2016 Remi Collet - 3.0.0-1 +- update to 3.0.0 for ZendFramework 3 +- add dependencies autoloader +- add dependency on paragonie/random_compat +- drop dependency on ircmaxell/random-lib * Fri Apr 8 2016 Remi Collet - 2.7.0-1 - update to 2.7.0 -- cgit