diff --git a/.gitignore b/.gitignore index f39012e..c9b4c55 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-swiftmailer6-6.2.5-698a6a9.tgz /php-swiftmailer6-6.2.6-d2791ff.tgz /php-swiftmailer6-6.2.7-15f7faf.tgz +/php-swiftmailer6-6.3.0-8a5d507.tgz diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec index 1174120..91fed38 100644 --- a/php-swiftmailer6.spec +++ b/php-swiftmailer6.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 15f7faf8508e04471f666633addacf54c0ab5933 +%global gh_commit 8a5d5072dca8f48460fce2f4131fcc495eec654c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swiftmailer %global gh_project swiftmailer @@ -18,8 +18,8 @@ %global php_home %{_datadir}/php Name: php-%{gh_project}%{major} -Version: 6.2.7 -Release: 2%{?dist} +Version: 6.3.0 +Release: 1%{?dist} Summary: Free Feature-rich PHP Mailer License: MIT @@ -47,14 +47,10 @@ BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { # "mockery/mockery": "^1.0", -# "symfony/phpunit-bridge": "^4.4|^5.0" +# "symfony/phpunit-bridge": "^4.4|^5.4 " BuildRequires: (php-composer(mockery/mockery) >= 1.0 with php-composer(mockery/mockery) < 2) #BuildRequires:(php-composer(symfony/phpunit-bridge) >= 4.4 with php-composer(symfony/phpunit-bridge) < 5) -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %global phpunit %{_bindir}/phpunit9 -%else -%global phpunit %{_bindir}/phpunit8 -%endif BuildRequires: %{phpunit} %endif BuildRequires: php-fedora-autoloader-devel @@ -157,7 +153,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml : Run upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --exclude smoke --verbose || ret=1 @@ -177,6 +173,9 @@ exit $ret %changelog +* Tue Oct 19 2021 Remi Collet - 6.3.0-1 +- update to 6.3.0 + * Fri Jul 23 2021 Fedora Release Engineering - 6.2.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 5d2f267..0113e1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swiftmailer6-6.2.7-15f7faf.tgz) = 4320f1b9fdad98e79d0e2009df693c3bf2c01eb2fbde074690a73df5a897027ab1e104ba3dcde00689cded1bc0feca052111f05e02b13d9ff8dd10e178258640 +SHA512 (php-swiftmailer6-6.3.0-8a5d507.tgz) = 24d0045c5cce2d3ea6f4d27fc213aa9348c549f492635f730c82a212935b253dbebd55a69d119f25c1ef8ee8e5ebfff22f41fba7c64b5a68ce3047c23a8e6e28