diff options
| -rw-r--r-- | PHPMailerRpmTest.php | 2 | ||||
| -rw-r--r-- | php-phpmailer6.spec | 40 |
2 files changed, 26 insertions, 16 deletions
diff --git a/PHPMailerRpmTest.php b/PHPMailerRpmTest.php index 1a4c903..979033a 100644 --- a/PHPMailerRpmTest.php +++ b/PHPMailerRpmTest.php @@ -23,7 +23,7 @@ final class PHPMailerRpmTest extends TestCase /** * Run before each test is started. */ - protected function setUp() + protected function setUp(): void { $this->Mail = new PHPMailer(); } diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec index f0d0f2d..5e45cda 100644 --- a/php-phpmailer6.spec +++ b/php-phpmailer6.spec @@ -7,7 +7,7 @@ # Please preserve changelog entries # # Github -%global gh_commit bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144 +%global gh_commit d1ac35d784bf9f5e61b424901d5a014967f15b12 %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.10.0 +Version: 6.12.0 Release: 1%{?dist} Summary: Full-featured email creation and transfer class for PHP @@ -42,13 +42,9 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 5.5 BuildRequires: php-ctype -BuildRequires: php-date -BuildRequires: php-filter -BuildRequires: php-hash BuildRequires: php-intl BuildRequires: php-mbstring BuildRequires: php-openssl -BuildRequires: php-pcre BuildRequires: php-fedora-autoloader-devel # From composer.json, "require-dev": { # "dealerdirect/phpcodesniffer-composer-installer": "^1.0", @@ -59,7 +55,7 @@ BuildRequires: php-fedora-autoloader-devel # "roave/security-advisories": "dev-latest", # "squizlabs/php_codesniffer": "^3.7.2", # "yoast/phpunit-polyfills": "^1.0.4" -%global phpunit %{_bindir}/phpunit7 +%global phpunit %{_bindir}/phpunit9 BuildRequires: (php-composer(yoast/phpunit-polyfills) >= 1.0.4 with php-composer(yoast/phpunit-polyfills) < 2) BuildRequires: %{phpunit} BuildRequires: %{_sbindir}/smtp-sink @@ -73,19 +69,16 @@ BuildRequires: %{_sbindir}/smtp-sink # "ext-hash": "*" Requires: php(language) >= 5.5 Requires: php-ctype -Requires: php-filter -Requires: php-hash # from phpcompatinfo report on version 6.1.3 -Requires: php-date Recommends: php-imap Requires: php-intl Requires: php-mbstring Requires: php-openssl -Requires: php-pcre # From composer.json, "suggest": { -# "ext-mbstring": "Needed to send email in multibyte encoding charset", -# "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", +# "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication", +# "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses", # "ext-openssl": "Needed for secure SMTP sending and DKIM signing", +# "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication", # "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication", # "league/oauth2-google": "Needed for Google XOAUTH2 authentication", # "psr/log": "For optional PSR-3 debug logging", @@ -181,10 +174,15 @@ popd : Run upstream test suite ret=0 -for cmd in php php81 php82 php83 php84; do +for cmd in php php81 php82 php83 php84 php85; do if which $cmd; then $cmd -d "sendmail_path=$PWD/test/fakesendmail.sh -t -i " \ - %{phpunit} --exclude slow,pop3,languages --verbose || ret=1 + %{phpunit} \ + --exclude slow,pop3,languages \ +%if 0%{?fedora} >= 43 + --filter '^((?!(testSigning|testSigningWithCA)).)*$' \ +%endif + || ret=1 fi done @@ -205,6 +203,18 @@ exit $ret %changelog +* Thu Oct 16 2025 Remi Collet <remi@remirepo.net> - 6.12.0-1 +- update to 6.12.0 + +* Tue Sep 30 2025 Remi Collet <remi@remirepo.net> - 6.11.1-1 +- update to 6.11.1 + +* Tue Sep 30 2025 Remi Collet <remi@remirepo.net> - 6.11.0-1 +- update to 6.11.0 + +* Thu Jun 26 2025 Remi Collet <remi@remirepo.net> - 6.10.0-2 +- use phpunit9 + * Mon Apr 28 2025 Remi Collet <remi@remirepo.net> - 6.10.0-1 - update to 6.10.0 - re-license spec file to CECILL-2.1 |