From 64121d4972619b26f1ffed252c73d1ba0ddbaaba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Apr 2018 07:37:55 +0200 Subject: [PATCH 1/2] update to 2.1.4 use range dependencies use phpunit6 (cherry picked from commit 7c1f3c6b4b476f7f696f08f575f6290cc57a37ea) --- .gitignore | 1 + php-egulias-email-validator2.spec | 39 +++++++++++++++++-------------- sources | 2 +- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index fec300d..373019c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-egulias-email-validator2-2.1.2-bc31baa.tgz /php-egulias-email-validator2-2.1.3-1bec00a.tgz +/php-egulias-email-validator2-2.1.4-8790f59.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index bf93e6c..5c973e5 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.3 -%global github_commit 1bec00a10039b823cc94eef4eddd47dcd3b2ca04 +%global github_version 2.1.4 +%global github_commit 8790f594151ca6a2010c6218e09d96df67173ad3 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -34,7 +34,6 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: A library for validating emails -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{name}-%{github_version}-%{github_short}.tgz @@ -43,11 +42,13 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php-composer(phpunit/phpunit) +## composer.json (require-dev) +# "phpunit/phpunit": "^4.8.35||^5.7||^6.0", +BuildRequires: phpunit6 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} -BuildRequires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} ## phpcompatinfo (computed from version 2.1.2) BuildRequires: php-dom BuildRequires: php-filter @@ -60,8 +61,7 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} -Requires: php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver} +Requires: (php-composer(doctrine/lexer) >= %{doctrine_lexer_min_ver} with php-composer(doctrine/lexer) < %{doctrine_lexer_max_ver}) # phpcompatinfo (computed from version 2.1.2) Requires: php-intl Requires: php-pcre @@ -113,16 +113,16 @@ rm Tests/EmailValidator/Validation/DNSCheckValidationTest.php rm Tests/EmailValidator/Validation/SpoofCheckValidationTest.php : Upstream tests -RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do - if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then - $PHP_EXEC $PHPUNIT --verbose \ - --bootstrap %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php \ - || RETURN_CODE=1 - fi +ret=0 +for cmdarg in "php %{phpunit}" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} \ + --bootstrap %{buildroot}%{phpdir}/Egulias/EmailValidator%{major}/autoload.php \ + --verbose|| ret=1 + fi done -exit $RETURN_CODE +exit $ret %else : Tests skipped %endif @@ -138,6 +138,11 @@ exit $RETURN_CODE %changelog +* Thu Apr 12 2018 Remi Collet - 2.1.4-1 +- update to 2.1.4 +- use range dependencies +- use phpunit6 + * Thu Nov 16 2017 Remi Collet - 2.1.3-1 - Update to 2.1.3 diff --git a/sources b/sources index 89101f6..04a1de6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.3-1bec00a.tgz) = 47188b64fed0fcdd10b39ae9b48936a6e8e40dcd5d217cef46706e05359c5d613d71bee70511bff10b834a343f6a7795b55dc1df3ea594b0840a641b853966ee +SHA512 (php-egulias-email-validator2-2.1.4-8790f59.tgz) = 83b6a7fe620c1c235fdf0477b4ada0810dfdbc725462b7c70baeeb07c45c4e3eeaf0043e81aa0ccc7a8f9a53cd2db19dd40669d817af341399d4ea1f2f7a09e8 From e6741fc4374f2987444d2aabf3c93eb73ffa0118 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Aug 2018 08:59:17 +0200 Subject: [PATCH 2/2] v2.1.5 (cherry picked from commit 779227c0464d7f33321ee785f764e9034942d5e5) (cherry picked from commit 39730cf36171f84b0c374e07cc11d784ef561d22) --- .gitignore | 1 + php-egulias-email-validator2.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 373019c..e71964b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-egulias-email-validator2-2.1.2-bc31baa.tgz /php-egulias-email-validator2-2.1.3-1bec00a.tgz /php-egulias-email-validator2-2.1.4-8790f59.tgz +/php-egulias-email-validator2-2.1.5-54859fa.tgz diff --git a/php-egulias-email-validator2.spec b/php-egulias-email-validator2.spec index 5c973e5..ae225e7 100644 --- a/php-egulias-email-validator2.spec +++ b/php-egulias-email-validator2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-egulias-email-validator2 # -# Copyright (c) 2014-2017 Shawn Iwinski, Remi Collet +# Copyright (c) 2014-2018 Shawn Iwinski, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -10,8 +10,8 @@ %global github_owner egulias %global github_name EmailValidator -%global github_version 2.1.4 -%global github_commit 8790f594151ca6a2010c6218e09d96df67173ad3 +%global github_version 2.1.5 +%global github_commit 54859fabea8b3beecbb1a282888d5c990036b9e3 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %global major 2 @@ -89,7 +89,6 @@ cat <<'AUTOLOAD' | tee EmailValidator/autoload.php - 2.1.5-1 +- update to 2.1.5 + * Thu Apr 12 2018 Remi Collet - 2.1.4-1 - update to 2.1.4 - use range dependencies diff --git a/sources b/sources index 04a1de6..229dc24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-egulias-email-validator2-2.1.4-8790f59.tgz) = 83b6a7fe620c1c235fdf0477b4ada0810dfdbc725462b7c70baeeb07c45c4e3eeaf0043e81aa0ccc7a8f9a53cd2db19dd40669d817af341399d4ea1f2f7a09e8 +SHA512 (php-egulias-email-validator2-2.1.5-54859fa.tgz) = 2a2012289b65aa2344fc08298e25f560385c7a4cbbcd14e1a5ad4339073298ab63402bbbba74d9b6bc2f1cf505daf0a04c5ff1af27fe684ec13e1c63050e629d