summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-10-10 07:54:36 +0200
committerRemi Collet <remi@remirepo.net>2020-10-10 07:54:36 +0200
commit48fe40c50cdca749b9ff5f7fa30090bf6c94f56b (patch)
treeae90e5eb0f7f6ec65686d5a4c615251ce142a892
parent5ba3b0c86680c2954899c660466a1fef63af029a (diff)
update to 6.1.8HEADmaster
-rw-r--r--composer.json3
-rw-r--r--php-phpmailer6.spec14
2 files changed, 11 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 90d2576..95a8991 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,8 @@
"require": {
"php": ">=5.5.0",
"ext-ctype": "*",
- "ext-filter": "*"
+ "ext-filter": "*",
+ "ext-hash": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.2",
diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec
index 04b6213..c68696f 100644
--- a/php-phpmailer6.spec
+++ b/php-phpmailer6.spec
@@ -7,7 +7,7 @@
# Please preserve changelog entries
#
# Github
-%global gh_commit 2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0
+%global gh_commit 917ab212fa00dc6eacbb26e8bc387ebe40993bc1
%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.1.7
+Version: 6.1.8
Release: 1%{?dist}
Summary: Full-featured email creation and transfer class for PHP
@@ -63,13 +63,14 @@ BuildRequires: %{_sbindir}/smtp-sink
# "require": {
# "php": ">=5.5.0",
# "ext-ctype": "*",
-# "ext-filter": "*"
+# "ext-filter": "*",
+# "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
-Requires: php-hash
Requires: php-imap
Requires: php-intl
Requires: php-mbstring
@@ -170,7 +171,7 @@ popd
: Run upstream test suite
ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php71 php72 php73 php74 php80; do
if which $cmd; then
$cmd -d "sendmail_path=$PWD/test/fakesendmail.sh -t -i " \
%{_bindir}/phpunit --exclude slow,pop3,languages --verbose || ret=1
@@ -196,6 +197,9 @@ exit $ret
%changelog
+* Sat Oct 10 2020 Remi Collet <remi@remirepo.net> - 6.1.8-1
+- update to 6.1.8
+
* Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 6.1.7-1
- update to 6.1.7