summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json8
-rw-r--r--php-swiftmailer6.spec54
2 files changed, 47 insertions, 15 deletions
diff --git a/composer.json b/composer.json
index 4043983..9e5d360 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Swiftmailer, free feature-rich PHP mailer",
"keywords": ["mail","mailer","email"],
- "homepage": "http://swiftmailer.symfony.com",
+ "homepage": "https://swiftmailer.symfony.com",
"license": "MIT",
"authors": [
{
@@ -22,6 +22,10 @@
"mockery/mockery": "~0.9.1",
"symfony/phpunit-bridge": "~3.3@dev"
},
+ "suggest": {
+ "ext-intl": "Needed to support internationalized email addresses",
+ "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+ },
"autoload": {
"files": ["lib/swift_required.php"]
},
@@ -30,7 +34,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "6.0-dev"
+ "dev-master": "6.1-dev"
}
}
}
diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec
index 1b7ddb8..c99de5d 100644
--- a/php-swiftmailer6.spec
+++ b/php-swiftmailer6.spec
@@ -6,7 +6,7 @@
#
# Please preserve changelog entries
#
-%global gh_commit 412333372fb6c8ffb65496a2bbd7321af75733fc
+%global gh_commit aa899fef280b1c1aec8d5d4ac069af7f80c89a23
%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.0.2
+Version: 6.1.1
Release: 1%{?dist}
Summary: Free Feature-rich PHP Mailer
@@ -28,13 +28,19 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 7.0.0
-BuildRequires: php-composer(egulias/email-validator) >= 2.0
-BuildRequires: php-composer(egulias/email-validator) < 3
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(egulias/email-validator) >= 2.0 with php-composer(egulias/email-validator) < 3)
+# remirepo:3
+%else
+BuildRequires: php-egulias-email-validator2
+%endif
+BuildRequires: php-intl
BuildRequires: php-reflection
BuildRequires: php-simplexml
BuildRequires: php-bcmath
-BuildRequires: php-ctype
BuildRequires: php-date
+BuildRequires: php-filter
BuildRequires: php-hash
BuildRequires: php-iconv
BuildRequires: php-mbstring
@@ -47,23 +53,37 @@ BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require-dev": {
# "mockery/mockery": "~0.9.1",
# "symfony/phpunit-bridge": "~3.3@dev"
-BuildRequires: php-composer(mockery/mockery) >= 0.9.1
-BuildRequires: php-composer(symfony/phpunit-bridge) < 4
-BuildRequires: php-composer(symfony/phpunit-bridge) >= 3.2
+# 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)
+# remirepo:4
+%else
+BuildRequires: php-deepend-Mockery >= 0.9.1
+BuildRequires: php-symfony3-phpunit-bridge >= 3.2
+%endif
%endif
# From composer.json, "require": {
# "php": ">=7.0.0",
# "egulias/email-validator": "~2.0"
Requires: php(language) >= 7.0.0
-Requires: php-composer(egulias/email-validator) >= 2.0
-Requires: php-composer(egulias/email-validator) < 3
-# from phpcompatinfo report on version 5.4.8
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(egulias/email-validator) >= 2.0 with php-composer(egulias/email-validator) < 3)
+# remirepo:2
+%else
+Requires: php-egulias-email-validator2
+%endif
+# From composer.json, "suggest": {
+# "ext-intl": "Needed to support internationalized email addresses",
+# "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+Requires: php-intl
+# from phpcompatinfo report on version 6.1.1
Requires: php-reflection
Requires: php-simplexml
Requires: php-bcmath
-Requires: php-ctype
Requires: php-date
+Requires: php-filter
Requires: php-hash
Requires: php-iconv
Requires: php-mbstring
@@ -128,7 +148,7 @@ EOF
: Run upstream test suite
ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
if which $cmd; then
$cmd %{_bindir}/phpunit6 --exclude smoke --verbose || ret=1
fi
@@ -148,6 +168,14 @@ exit $ret
%changelog
+* Wed Jul 4 2018 Remi Collet <remi@remirepo.net> - 6.1.1-1
+- update to 6.1.1
+
+* Tue Jul 3 2018 Remi Collet <remi@remirepo.net> - 6.1.0-1
+- update to 6.1.0
+- add dependency on intl extension
+- use range dependencies on F27+
+
* Wed Oct 4 2017 Remi Collet <remi@remirepo.net> - 6.0.2-1
- Update to 6.0.2
- rename to php-swiftmailer6