diff --git a/.gitignore b/.gitignore index e1bbbca..e5c6230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/php-myclabs-php-enum-1.5.2-3ed7088.tgz -/php-myclabs-php-enum-1.6.1-8c5649e.tgz +clog +/php-myclabs-php-enum-1.*.tgz diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 8ae82f6..25139ba 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-myclabs-php-enum # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2017-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 8c5649e4ed99acd53a40eada270154dcac089f7e +%global gh_commit 32c4202886c51fbe5cc3a7c34ec5c9a4a790345e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,11 +20,10 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.6.1 +Version: 1.6.6 Release: 1%{?dist} Summary: PHP Enum implementation -Group: Development/Libraries License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} # git snashop to get upstream test suite @@ -41,7 +40,7 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^4.8.35|^5.7|^6.0", # "squizlabs/php_codesniffer": "1.*" -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 %else %global phpunit %{_bindir}/phpunit @@ -52,11 +51,12 @@ BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=5.4" +# "php": ">=5.4", +# "ext-json": "*" Requires: php(language) >= 5.4 +Requires: php-json # From phpcompatinfo report for version 1.6.1 Requires: php-reflection -Requires: php-json Requires: php-spl # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -101,7 +101,7 @@ require '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF ret=0 -for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72 php73; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -123,6 +123,18 @@ exit $ret %changelog +* Tue Feb 5 2019 Remi Collet - 1.6.6-1 +- update to 1.6.6 + +* Tue Oct 30 2018 Remi Collet - 1.6.4-1 +- update to 1.6.4 + +* Mon Oct 29 2018 Remi Collet - 1.6.3-1 +- update to 1.6.3 + +* Fri Aug 24 2018 Remi Collet - 1.6.2-1 +- update to 1.6.2 + * Mon May 14 2018 Remi Collet - 1.6.1-1 - update to 1.6.1 - raise dependency on PHP 5.4 diff --git a/sources b/sources index 17b86d2..0e22bbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.6.1-8c5649e.tgz) = 7715221873d5263b81ba137129de4450f03a3d2bd3a6409025e87cfeecdd8a6f6e331736dc665d5a8b4cf0431e2c422d198cab3deb4f049cde22a455663d5678 +SHA512 (php-myclabs-php-enum-1.6.6-32c4202.tgz) = b43b3485866c4bcf84f26824adecc260501e30c2977edcafa81bb91a4c9f3e39a58627491b16311a5f50f914e8ddf9fc7ddda4458b0d24806608392dc03074ef