summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-03-11 07:49:08 +0100
committerRemi Collet <remi@remirepo.net>2019-03-11 07:49:08 +0100
commit0bbeac69b9b1aee5acd90221b2554d2107edbda5 (patch)
tree6f40f2a6d48e46db2b20a824dc6917f301bef755
parent2417541e3835db10ba9afd95bd0ce3c880e16d0c (diff)
v6.2.0
-rw-r--r--composer.json9
-rw-r--r--php-swiftmailer6.spec20
2 files changed, 19 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index 9e5d360..a996e21 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,14 @@
],
"require": {
"php": ">=7.0.0",
- "egulias/email-validator": "~2.0"
+ "egulias/email-validator": "~2.0",
+ "symfony/polyfill-iconv": "^1.0",
+ "symfony/polyfill-mbstring": "^1.0",
+ "symfony/polyfill-intl-idn": "^1.10"
},
"require-dev": {
"mockery/mockery": "~0.9.1",
- "symfony/phpunit-bridge": "~3.3@dev"
+ "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
},
"suggest": {
"ext-intl": "Needed to support internationalized email addresses",
@@ -34,7 +37,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "6.1-dev"
+ "dev-master": "6.2-dev"
}
}
}
diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec
index cda0f89..d525f22 100644
--- a/php-swiftmailer6.spec
+++ b/php-swiftmailer6.spec
@@ -6,7 +6,7 @@
#
# Please preserve changelog entries
#
-%global gh_commit 8ddcb66ac10c392d3beb54829eef8ac1438595f4
+%global gh_commit 6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner swiftmailer
%global gh_project swiftmailer
@@ -16,7 +16,7 @@
%global php_home %{_datadir}/php
Name: php-%{gh_project}%{major}
-Version: 6.1.3
+Version: 6.2.0
Release: 1%{?dist}
Summary: Free Feature-rich PHP Mailer
@@ -52,21 +52,24 @@ BuildRequires: phpunit6
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require-dev": {
# "mockery/mockery": "~0.9.1",
-# "symfony/phpunit-bridge": "~3.3@dev"
+# "symfony/phpunit-bridge": "^3.4.19|^4.1.8"
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(mockery/mockery) >= 0.9.1 with php-composer(mockery/mockery) < 1)
-BuildRequires: (php-composer(symfony/phpunit-bridge) >= 3.2 with php-composer(symfony/phpunit-bridge) < 4)
+BuildRequires: (php-composer(mockery/mockery) >= 0.9.1 with php-composer(mockery/mockery) < 1)
+BuildRequires: (php-composer(symfony/phpunit-bridge) >= 3.4.19 with php-composer(symfony/phpunit-bridge) < 4)
# remirepo:4
%else
BuildRequires: php-deepend-Mockery >= 0.9.1
-BuildRequires: php-symfony3-phpunit-bridge >= 3.2
+BuildRequires: php-symfony3-phpunit-bridge >= 3.4.19
%endif
%endif
# From composer.json, "require": {
# "php": ">=7.0.0",
-# "egulias/email-validator": "~2.0"
+# "egulias/email-validator": "~2.0",
+# "symfony/polyfill-iconv": "^1.0",
+# "symfony/polyfill-mbstring": "^1.0",
+# "symfony/polyfill-intl-idn": "^1.10"
Requires: php(language) >= 7.0.0
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(egulias/email-validator) >= 2.0 with php-composer(egulias/email-validator) < 3)
@@ -168,6 +171,9 @@ exit $ret
%changelog
+* Mon Mar 11 2019 Remi Collet <remi@remirepo.net> - 6.2.0-1
+- update to 6.2.0
+
* Tue Sep 11 2018 Remi Collet <remi@remirepo.net> - 6.1.3-1
- update to 6.1.3