summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-12-10 14:37:23 +0100
committerRemi Collet <remi@remirepo.net>2019-12-10 14:37:23 +0100
commit76eebdaf0f47c2c21da7f0e42c83627361019377 (patch)
tree7e7b4d8e47d408b61168611cf9eb2bb7bd574d9f
parent14178ead59a89d38b26e03dd61ebc29caa1b833e (diff)
v6.1.4
-rw-r--r--composer.json6
-rw-r--r--php-phpmailer6.spec18
2 files changed, 11 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index d1b1417..fd0695c 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,8 @@
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.2",
- "phpdocumentor/phpdocumentor": "2.*",
"phpunit/phpunit": "^4.8 || ^5.7",
- "zendframework/zend-serializer": "2.7.*",
- "doctrine/annotations": "1.2.*",
- "zendframework/zend-eventmanager": "3.0.*",
- "zendframework/zend-i18n": "2.7.3"
+ "doctrine/annotations": "^1.2"
},
"suggest": {
"psr/log": "For optional PSR-3 debug logging",
diff --git a/php-phpmailer6.spec b/php-phpmailer6.spec
index 8be67c5..047af2f 100644
--- a/php-phpmailer6.spec
+++ b/php-phpmailer6.spec
@@ -7,7 +7,7 @@
# Please preserve changelog entries
#
# Github
-%global gh_commit 0ae8505d26fa7fa15d3d2d5ec1e695e854bb1538
+%global gh_commit c5e61d0729507049cec9673aa1a679f9adefd683
%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.2
+Version: 6.1.4
Release: 1%{?dist}
Summary: Full-featured email creation and transfer class for PHP
@@ -53,12 +53,8 @@ BuildRequires: php-pcre
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require-dev": {
# "friendsofphp/php-cs-fixer": "^2.2",
-# "phpdocumentor/phpdocumentor": "2.*",
# "phpunit/phpunit": "^4.8 || ^5.7",
-# "zendframework/zend-serializer": "2.7.*",
-# "doctrine/annotations": "1.2.*",
-# "zendframework/zend-eventmanager": "3.0.*",
-# "zendframework/zend-i18n": "2.7.3"
+# "doctrine/annotations": "^1.2",
BuildRequires: php-phpunit-PHPUnit >= 4.8
BuildRequires: %{_sbindir}/smtp-sink
%endif
@@ -71,7 +67,7 @@ BuildRequires: %{_sbindir}/smtp-sink
Requires: php(language) >= 5.5
Requires: php-ctype
Requires: php-filter
-# from phpcompatinfo report on version 6.0.1
+# from phpcompatinfo report on version 6.1.3
Requires: php-date
Requires: php-hash
Requires: php-imap
@@ -199,6 +195,12 @@ exit $ret
%changelog
+* Tue Dec 10 2019 Remi Collet <remi@remirepo.net> - 6.1.4-1
+- update to 6.1.4
+
+* Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 6.1.3-1
+- update to 6.1.3
+
* Thu Nov 14 2019 Remi Collet <remi@remirepo.net> - 6.1.2-1
- update to 6.1.2