summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-07-27 11:48:00 +0200
committerRemi Collet <remi@remirepo.net>2018-07-27 11:48:00 +0200
commitc92b6d27b7357240823c348d43ac5f451b18685d (patch)
tree65dfceefc809007b744418de9369d299db2dbf37
parenteeaba1d4140df2b54946940c31027bb36a96bc82 (diff)
v5.4.10
-rw-r--r--php-swiftmailer.spec17
1 files changed, 12 insertions, 5 deletions
diff --git a/php-swiftmailer.spec b/php-swiftmailer.spec
index 23c2163..f3e5866 100644
--- a/php-swiftmailer.spec
+++ b/php-swiftmailer.spec
@@ -6,7 +6,7 @@
#
# Please preserve changelog entries
#
-%global gh_commit 7ffc1ea296ed14bf8260b6ef11b80208dbadba91
+%global gh_commit dd71cc1638ed7aebbb33f2e2b0edd2cf6ea73d97
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner swiftmailer
%global gh_project swiftmailer
@@ -14,7 +14,7 @@
%global php_home %{_datadir}/php
Name: php-%{gh_project}
-Version: 5.4.9
+Version: 5.4.10
Release: 1%{?dist}
Summary: Free Feature-rich PHP Mailer
@@ -42,8 +42,14 @@ BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require-dev": {
# "mockery/mockery": "~0.9.1",
# "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)
+# remirepo:4
+%else
BuildRequires: php-composer(mockery/mockery) < 1
BuildRequires: php-composer(mockery/mockery) >= 0.9.1
+%endif
# ignore minimal version as test suite passes with 2.8
BuildRequires: php-composer(symfony/phpunit-bridge) < 4
%endif
@@ -66,12 +72,10 @@ Requires: php-pcre
Requires: php-spl
# Removed from official repo in Fedora 25
-%if 1
Obsoletes: php-swift-Swift <= 5.4.1
# Single package in this channel
Obsoletes: php-channel-swift <= 1.3
Provides: php-pear(pear.swiftmailer.org/Swift) = %{version}
-%endif
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -127,7 +131,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}/phpunit --exclude smoke --verbose || ret=1
fi
@@ -147,6 +151,9 @@ exit $ret
%changelog
+* Fri Jul 27 2018 Remi Collet <remi@remirepo.net> - 5.4.10-1
+- update to 5.4.10
+
* Tue Jan 23 2018 Remi Collet <remi@remirepo.net> - 5.4.9-1
- Update to 5.4.9