From 205d68a8faec85e5b848935ca479a59ccab64cfb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Mar 2021 14:04:02 +0100
Subject: update to 6.2.7 allow egulias/email-validator v3

---
 composer.json         |  2 +-
 php-swiftmailer6.spec | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index d66dc4c..31d05fd 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": ">=7.0.0",
-        "egulias/email-validator": "^2.0",
+        "egulias/email-validator": "^2.0|^3.1",
         "symfony/polyfill-iconv": "^1.0",
         "symfony/polyfill-mbstring": "^1.0",
         "symfony/polyfill-intl-idn": "^1.10"
diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec
index 5eaeaf9..63b4db9 100644
--- a/php-swiftmailer6.spec
+++ b/php-swiftmailer6.spec
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    d2791ff0b73247cdc2096b14f5580aba40c12bff
+%global gh_commit    15f7faf8508e04471f666633addacf54c0ab5933
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     swiftmailer
 %global gh_project   swiftmailer
@@ -18,7 +18,7 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{gh_project}%{major}
-Version:        6.2.6
+Version:        6.2.7
 Release:        1%{?dist}
 Summary:        Free Feature-rich PHP Mailer
 
@@ -33,7 +33,7 @@ BuildArch:      noarch
 BuildRequires:  php(language) >= 7.0.0
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(egulias/email-validator) >= 2.0  with php-composer(egulias/email-validator) <  3)
+BuildRequires: (php-composer(egulias/email-validator) >= 2.0  with php-composer(egulias/email-validator) <  4)
 # remirepo:3
 %else
 BuildRequires:  php-egulias-email-validator2
@@ -74,13 +74,13 @@ BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
 #        "php": ">=7.0.0",
-#        "egulias/email-validator": "^2.0",
+#        "egulias/email-validator": "^2.0|^3.1",
 #        "symfony/polyfill-iconv": "^1.0",
 #        "symfony/polyfill-mbstring": "^1.0",
 #        "symfony/polyfill-intl-idn": "^1.10"
 Requires:       php(language) >= 7.0.0
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(egulias/email-validator) >= 2.0  with php-composer(egulias/email-validator) <  3)
+Requires:      (php-composer(egulias/email-validator) >= 2.0  with php-composer(egulias/email-validator) <  4)
 # remirepo:2
 %else
 Requires:       php-egulias-email-validator2
@@ -120,7 +120,11 @@ Autoloader: %{php_home}/Swift%{major}/autoload.php
 cat << 'EOF' | tee lib/autoload.php
 <?php
 /* Autoloader for %{name} and its' dependencies */
-require_once '%{php_home}/Egulias/EmailValidator2/autoload.php';
+if (file_exists('%{php_home}/Egulias/EmailValidator3/autoload.php')) {
+   require_once '%{php_home}/Egulias/EmailValidator3/autoload.php';
+} else {
+   require_once '%{php_home}/Egulias/EmailValidator2/autoload.php';
+}
 require_once __DIR__ . '/swift_required.php';
 EOF
 
@@ -192,6 +196,10 @@ exit $ret
 
 
 %changelog
+* Tue Mar  9 2021 Remi Collet <remi@remirepo.net> - 6.2.7-1
+- update to 6.2.7
+- allow egulias/email-validator v3
+
 * Fri Mar  5 2021 Remi Collet <remi@remirepo.net> - 6.2.6-1
 - update to 6.2.6
 
-- 
cgit