From b0e24e1c0f8a0922a536810fcc509594fcb6cb36 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Feb 2019 07:15:20 +0100 Subject: [PATCH 1/4] v1.6.6 (cherry picked from commit f101061f9704b20ccd617054336781abe1d5753c) --- 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 521b8df..a71292d 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 From 630ce0185f6bb0cc86627ab713825d17211e8a6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Apr 2019 09:04:34 +0200 Subject: [PATCH 2/4] update to 1.7.0 raise dependency on PHP 7.2 (cherry picked from commit fdd5cf6afed62da8692be5c335881472d061e3d6) --- php-myclabs-php-enum.spec | 20 ++++++++++---------- sources | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index a71292d..e47b617 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 32c4202886c51fbe5cc3a7c34ec5c9a4a790345e +%global gh_commit e00b7b3d8d2ef0da908ea9d3df627271b93a9253 %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.6 +Version: 1.7.0 Release: 1%{?dist} Summary: PHP Enum implementation @@ -33,27 +33,23 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 5.4 +BuildRequires: php(language) >= 7.2 BuildRequires: php-reflection BuildRequires: php-json 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 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif BuildRequires: %{phpunit} # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=5.4", +# "php": ">=7.2", # "ext-json": "*" -Requires: php(language) >= 5.4 +Requires: php(language) >= 7.2 Requires: php-json # From phpcompatinfo report for version 1.6.1 Requires: php-reflection @@ -101,7 +97,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 php73; do +for cmd in "php %{phpunit}" php72 php73; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -123,6 +119,10 @@ exit $ret %changelog +* Wed Apr 24 2019 Remi Collet - 1.7.0-1 +- update to 1.7.0 +- raise dependency on PHP 7.2 + * Tue Feb 5 2019 Remi Collet - 1.6.6-1 - update to 1.6.6 diff --git a/sources b/sources index 0e22bbc..5e5dc36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.6.6-32c4202.tgz) = b43b3485866c4bcf84f26824adecc260501e30c2977edcafa81bb91a4c9f3e39a58627491b16311a5f50f914e8ddf9fc7ddda4458b0d24806608392dc03074ef +SHA512 (php-myclabs-php-enum-1.7.0-e00b7b3.tgz) = bba7d873100126baf2ec1046d748e7e5c390fdf187ed27658f7d907d11534276010949baa3b58d52c3fa57028969e82a332dd63bbe59a861776b557f58b39bd7 From d755744b5fde1cc03a988f5e2f4f90de863bc5e8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 May 2019 09:20:07 +0200 Subject: [PATCH 3/4] update to 1.7.1 lower dependency on PHP 7.1 (cherry picked from commit b5e43345eb24a2c419de0a33ab329e3735f4a736) --- php-myclabs-php-enum.spec | 21 +++++++++++++-------- sources | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index e47b617..d3860fd 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 e00b7b3d8d2ef0da908ea9d3df627271b93a9253 +%global gh_commit f46847626b8739de22e4ebc6b56010f317d4448d %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.7.0 +Version: 1.7.1 Release: 1%{?dist} Summary: PHP Enum implementation @@ -33,7 +33,7 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.1 BuildRequires: php-reflection BuildRequires: php-json BuildRequires: php-spl @@ -47,9 +47,9 @@ BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=7.2", +# "php": ">=7.1", # "ext-json": "*" -Requires: php(language) >= 7.2 +Requires: php(language) >= 7.1 Requires: php-json # From phpcompatinfo report for version 1.6.1 Requires: php-reflection @@ -90,17 +90,18 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project} %check %if %{with_tests} mkdir vendor -cat << 'EOF' | tee vendor/autoload.php +cat << 'EOF' | tee tests/autoload.php - 1.7.1-1 +- update to 1.7.1 +- lower dependency on PHP 7.1 + * Wed Apr 24 2019 Remi Collet - 1.7.0-1 - update to 1.7.0 - raise dependency on PHP 7.2 diff --git a/sources b/sources index 5e5dc36..a932dc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.7.0-e00b7b3.tgz) = bba7d873100126baf2ec1046d748e7e5c390fdf187ed27658f7d907d11534276010949baa3b58d52c3fa57028969e82a332dd63bbe59a861776b557f58b39bd7 +SHA512 (php-myclabs-php-enum-1.7.1-f468476.tgz) = 0bde392fc9ac903d6d2f13bf2f54e824ce9a137df64ec4e86eb5b1d42a30b6733682e3511f7dc7f9fbf90e836af81c5b9ac1c9e02b4ac5b8dc14c8da77ecc71b From 61563d1a7f64d9053f8169a4e6b5bbfdd585f0bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Aug 2019 11:51:32 +0200 Subject: [PATCH 4/4] v1.7.2 (cherry picked from commit 2db792af05e8b02858e49dd634eb926b517ce7e1) (cherry picked from commit 8f7e6384973ad1a86c7f75bfb52925c70d1504f4) --- php-myclabs-php-enum.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index d3860fd..fa30682 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 f46847626b8739de22e4ebc6b56010f317d4448d +%global gh_commit 45f01adf6922df6082bcda36619deb466e826acf %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.7.1 +Version: 1.7.2 Release: 1%{?dist} Summary: PHP Enum implementation @@ -98,7 +98,7 @@ require __DIR__ . '/bootstrap.php'; EOF ret=0 -for cmd in "php %{phpunit}" php71 php72 php73; do +for cmd in "php %{phpunit}" php71 php72 php73 php74; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit6} --verbose --bootstrap tests/autoload.php || ret=1 @@ -120,6 +120,9 @@ exit $ret %changelog +* Tue Aug 20 2019 Remi Collet - 1.7.2-1 +- update to 1.7.2 + * Mon May 6 2019 Remi Collet - 1.7.1-1 - update to 1.7.1 - lower dependency on PHP 7.1 diff --git a/sources b/sources index a932dc9..ad8e63b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.7.1-f468476.tgz) = 0bde392fc9ac903d6d2f13bf2f54e824ce9a137df64ec4e86eb5b1d42a30b6733682e3511f7dc7f9fbf90e836af81c5b9ac1c9e02b4ac5b8dc14c8da77ecc71b +SHA512 (php-myclabs-php-enum-1.7.2-45f01ad.tgz) = 3daeea18bca30c1bb1d0acd06a26775b271b06c236e393df23984b0104d151234e5c96ac2344767dfdd0ebb9f7434f1490c700f66c3dae10925cd92ea4512a8b