From 555b328cc38217088d9f432ce526dcbe92f4afce Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Feb 2021 09:38:34 +0100
Subject: update to 6.3.0

---
 php-phpmailer6-layout.patch |  8 ++++----
 php-phpmailer6.spec         | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/php-phpmailer6-layout.patch b/php-phpmailer6-layout.patch
index 1d287f3..8f254ec 100644
--- a/php-phpmailer6-layout.patch
+++ b/php-phpmailer6-layout.patch
@@ -1,10 +1,10 @@
 diff -up ./src/PHPMailer.php.rpm ./src/PHPMailer.php
---- ./src/PHPMailer.php.rpm	2018-03-27 14:01:40.736223588 +0200
-+++ ./src/PHPMailer.php	2018-03-27 14:02:31.291471961 +0200
-@@ -1994,7 +1994,7 @@ class PHPMailer
+--- ./src/PHPMailer.php.rpm	2021-02-24 09:34:44.854775099 +0100
++++ ./src/PHPMailer.php	2021-02-24 09:35:04.783696615 +0100
+@@ -2215,7 +2215,7 @@ class PHPMailer
          ];
          if (empty($lang_path)) {
-             // Calculate an absolute path so it can work if CWD is not here
+             //Calculate an absolute path so it can work if CWD is not here
 -            $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
 +            $lang_path = __DIR__ . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
          }
diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec
index 832fa0b..7a36f17 100644
--- a/php-phpmailer6.spec
+++ b/php-phpmailer6.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-phpmailer6
 #
-# Copyright (c) 2017-2020 Remi Collet
+# Copyright (c) 2017-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please preserve changelog entries
 #
 # Github
-%global gh_commit    e38888a75c070304ca5514197d4847a59a5c853f
+%global gh_commit    4a08cf4cdd2c38d12ee2b9fa69e5d235f37a6dcb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     PHPMailer
 %global gh_project   PHPMailer
@@ -23,7 +23,7 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_project}%{major}
-Version:        6.2.0
+Version:        6.3.0
 Release:        1%{?dist}
 Summary:        Full-featured email creation and transfer class for PHP
 
@@ -125,7 +125,8 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
+%patch0 -p1 -b .rpm
+find src -name \*.rpm -delete
 
 cp %{SOURCE2} test/PHPMailerRpmTest.php
 
@@ -161,7 +162,7 @@ require_once '%{php_home}/Yoast/PHPUnitPolyfills/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('PHPMailer\\Test\\', dirname(__DIR__) . '/test');
 EOF
 
-sed -e '/colors/d;s/logging/nologging/' travis.phpunit.xml.dist > phpunit.xml
+sed -e '/colors/d;s/logging/nologging/' phpunit.xml.dist > phpunit.xml
 
 : Start fake MTA and test environment
 PORT=$(expr 2500 + %{?fedora}%{?rhel})
@@ -203,6 +204,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 6.3.0-1
+- update to 6.3.0
+
 * Thu Nov 26 2020 Remi Collet <remi@remirepo.net> - 6.2.0-1
 - update to 6.2.0
 - add build dependency on yoast/phpunit-polyfills
-- 
cgit