v2.1.5

(cherry picked from commit 779227c046)
(cherry picked from commit 39730cf361)

.gitignore

@@ -1,2 +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

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.3
-%global github_commit    1bec00a10039b823cc94eef4eddd47dcd3b2ca04
+%global github_version   2.1.5
+%global github_commit    54859fabea8b3beecbb1a282888d5c990036b9e3
 %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
@@ -89,7 +89,6 @@ cat <<'AUTOLOAD' | tee EmailValidator/autoload.php
 <?php
 /**
  * Autoloader for %{name} and its' dependencies
- * (created by %{name}-%{version}-%{release}).
  */
 require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
@@ -113,16 +112,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 php73; 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 +137,14 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 2.1.5-1
+- update to 2.1.5
+
+* Thu Apr 12 2018 Remi Collet <remi@remirepo.net> - 2.1.4-1
+- update to 2.1.4
+- use range dependencies
+- use phpunit6
+
 * Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 2.1.3-1
 - Update to 2.1.3
 

sources

@@ -1 +1 @@
-SHA512 (php-egulias-email-validator2-2.1.3-1bec00a.tgz) = 47188b64fed0fcdd10b39ae9b48936a6e8e40dcd5d217cef46706e05359c5d613d71bee70511bff10b834a343f6a7795b55dc1df3ea594b0840a641b853966ee
+SHA512 (php-egulias-email-validator2-2.1.5-54859fa.tgz) = 2a2012289b65aa2344fc08298e25f560385c7a4cbbcd14e1a5ad4339073298ab63402bbbba74d9b6bc2f1cf505daf0a04c5ff1af27fe684ec13e1c63050e629d