From ca140b92aceafa981a8ed52bf30316538257c376 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Aug 2018 07:19:17 +0200 Subject: [PATCH 1/4] v1.6.2 (cherry picked from commit 8f47be9b45dc32e63057a3a9b2835deb8c8b2264) --- .gitignore | 1 + php-myclabs-php-enum.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e1bbbca..971e4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-myclabs-php-enum-1.5.2-3ed7088.tgz /php-myclabs-php-enum-1.6.1-8c5649e.tgz +/php-myclabs-php-enum-1.6.2-ca2f409.tgz diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 8ae82f6..e20576d 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 8c5649e4ed99acd53a40eada270154dcac089f7e +%global gh_commit ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: PHP Enum implementation @@ -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,9 @@ exit $ret %changelog +* 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..22d9ef5 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.2-ca2f409.tgz) = e9930a0e4a4ba7a9b1612d005e80284d60dc81553567c24321d8422106b16d89626dc7cfd88cb8c41135dc6de59942c24dee097f7c905c948b5049303809d9e5 From e3f35b91f6ce93fcf897cde755ebbfac3801e794 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Oct 2018 09:27:48 +0100 Subject: [PATCH 2/4] v1.6.3 (cherry picked from commit 19e54c89fd52288bede5126a708ccc1ebe2a6806) --- .gitignore | 1 + php-myclabs-php-enum.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 971e4bb..db95c7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-myclabs-php-enum-1.5.2-3ed7088.tgz /php-myclabs-php-enum-1.6.1-8c5649e.tgz /php-myclabs-php-enum-1.6.2-ca2f409.tgz +/php-myclabs-php-enum-1.6.3-a8284c7.tgz diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index e20576d..0c247a3 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-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219 +%global gh_commit a8284c7c540caf9988e339a404cadcdf1e8b165d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: PHP Enum implementation @@ -41,7 +41,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 @@ -123,6 +123,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 22d9ef5..92d5dc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.6.2-ca2f409.tgz) = e9930a0e4a4ba7a9b1612d005e80284d60dc81553567c24321d8422106b16d89626dc7cfd88cb8c41135dc6de59942c24dee097f7c905c948b5049303809d9e5 +SHA512 (php-myclabs-php-enum-1.6.3-a8284c7.tgz) = 306d3cd517873ec729ae78fb6ed80d27b4f75d8aa57b751401b4d8a84d67c50da79fc42f497e81bfff43d64d82872152fb421b2a669c649f8e911e863df35557 From d0699bbf0d63a43fe616d9a14b831c2ab4d591b6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 31 Oct 2018 06:50:07 +0100 Subject: [PATCH 3/4] v1.6.4 (cherry picked from commit 607e5f5e6eebc4611cae51f0f7bf3656025ed83d) --- .gitignore | 6 ++---- php-myclabs-php-enum.spec | 8 +++++--- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index db95c7f..e5c6230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/php-myclabs-php-enum-1.5.2-3ed7088.tgz -/php-myclabs-php-enum-1.6.1-8c5649e.tgz -/php-myclabs-php-enum-1.6.2-ca2f409.tgz -/php-myclabs-php-enum-1.6.3-a8284c7.tgz +clog +/php-myclabs-php-enum-1.*.tgz diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 0c247a3..14783e7 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit a8284c7c540caf9988e339a404cadcdf1e8b165d +%global gh_commit 550d2334d77f91b0816a5cbd6965272fe20146b8 %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.3 +Version: 1.6.4 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 @@ -123,6 +122,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 92d5dc4..4f93878 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.6.3-a8284c7.tgz) = 306d3cd517873ec729ae78fb6ed80d27b4f75d8aa57b751401b4d8a84d67c50da79fc42f497e81bfff43d64d82872152fb421b2a669c649f8e911e863df35557 +SHA512 (php-myclabs-php-enum-1.6.4-550d233.tgz) = a50d144c3ea424b1d28d77b93f61881b1724c51000de1c04ad614d506df2b04813c770983d3f42ec9dbaa7a68fca1399baba518742b57c291c6c193141f1e205 From 5503fa547856d4be836f45e53339978000e670be Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Feb 2019 07:15:20 +0100 Subject: [PATCH 4/4] v1.6.6 (cherry picked from commit f101061f9704b20ccd617054336781abe1d5753c) (cherry picked from commit b0e24e1c0f8a0922a536810fcc509594fcb6cb36) --- php-myclabs-php-enum.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 14783e7..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-2018 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 550d2334d77f91b0816a5cbd6965272fe20146b8 +%global gh_commit 32c4202886c51fbe5cc3a7c34ec5c9a4a790345e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.6.4 +Version: 1.6.6 Release: 1%{?dist} Summary: PHP Enum implementation @@ -51,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) @@ -122,6 +123,9 @@ 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 diff --git a/sources b/sources index 4f93878..0e22bbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.6.4-550d233.tgz) = a50d144c3ea424b1d28d77b93f61881b1724c51000de1c04ad614d506df2b04813c770983d3f42ec9dbaa7a68fca1399baba518742b57c291c6c193141f1e205 +SHA512 (php-myclabs-php-enum-1.6.6-32c4202.tgz) = b43b3485866c4bcf84f26824adecc260501e30c2977edcafa81bb91a4c9f3e39a58627491b16311a5f50f914e8ddf9fc7ddda4458b0d24806608392dc03074ef