From aa99f692e9c3c105835895cda65101caee811245 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 9 Oct 2024 14:56:19 +0200
Subject: update to 6.9.2

---
 composer.json       |  3 ++-
 php-phpmailer6.spec | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index fa170a0..7b008b7 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "lock": false
     },
     "require": {
         "php": ">=5.5.0",
diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec
index c1d430e..d7079de 100644
--- a/php-phpmailer6.spec
+++ b/php-phpmailer6.spec
@@ -7,7 +7,7 @@
 # Please preserve changelog entries
 #
 # Github
-%global gh_commit    039de174cd9c17a8389754d3b877a2ed22743e18
+%global gh_commit    a7b17b42fa4887c92146243f3d2f4ccb962af17c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     PHPMailer
 %global gh_project   PHPMailer
@@ -23,8 +23,8 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_project}%{major}
-Version:        6.9.1
-Release:        6%{?dist}
+Version:        6.9.2
+Release:        1%{?dist}
 Summary:        Full-featured email creation and transfer class for PHP
 
 License:        LGPL-2.1-only
@@ -77,11 +77,7 @@ Requires:       php-filter
 Requires:       php-hash
 # from phpcompatinfo report on version 6.1.3
 Requires:       php-date
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Recommends:     php-imap
-%else
-Requires:       php-imap
-%endif
 Requires:       php-intl
 Requires:       php-mbstring
 Requires:       php-openssl
@@ -95,9 +91,7 @@ Requires:       php-pcre
 #        "psr/log": "For optional PSR-3 debug logging",
 #        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
 #        "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Suggests:       php-composer(psr/log)
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
@@ -187,7 +181,7 @@ popd
 
 : Run upstream test suite
 ret=0
-for cmd in php php81 php82 php83; do
+for cmd in php php81 php82 php83 php84; do
   if which $cmd; then
     $cmd  -d "sendmail_path=$PWD/test/fakesendmail.sh -t -i " \
       %{phpunit} --exclude slow,pop3,languages --verbose || ret=1
@@ -211,6 +205,9 @@ exit $ret
 
 
 %changelog
+* Wed Oct  9 2024 Remi Collet <remi@remirepo.net> - 6.9.2-1
+- update to 6.9.2
+
 * Fri Aug 30 2024 Remi Collet <remi@remirepo.net> - 6.9.1-6
 - fix build dependency on yoast/phpunit-polyfills 1.0.4
 
-- 
cgit