From 12debc4c7ada68434de0ace3f766cbc528671884 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jun 2016 13:56:29 +0200 Subject: php-swiftmailer: add patch for mockery 0.9.x --- php-swiftmailer.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'php-swiftmailer.spec') diff --git a/php-swiftmailer.spec b/php-swiftmailer.spec index 83589c8..39e5922 100644 --- a/php-swiftmailer.spec +++ b/php-swiftmailer.spec @@ -15,7 +15,7 @@ Name: php-%{gh_project} Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Free Feature-rich PHP Mailer Group: Development/Libraries @@ -23,6 +23,9 @@ License: MIT URL: http://www.swiftmailer.org/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +# https://github.com/swiftmailer/swiftmailer/pull/769 +Patch0: %{name}-mockery.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if %{with_tests} @@ -31,7 +34,6 @@ BuildRequires: php-composer(theseer/autoload) # From composer.json, "require-dev": { # "mockery/mockery": "~0.9.1,<0.9.4" BuildRequires: php-composer(mockery/mockery) >= 0.9.1 -BuildRequires: php-composer(mockery/mockery) < 0.9.4 %endif # From composer.json, "require": { @@ -73,6 +75,8 @@ Autoloader: %{php_home}/Swift/swift_required.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 + # Install using the same layout than the old PEAR package mv lib/swift_required_pear.php lib/swift_required.php rm lib/swiftmailer_generate_mimes_config.php @@ -148,6 +152,10 @@ rm -rf %{buildroot} %changelog +* Tue Jun 14 2016 Remi Collet - 5.4.2-2 +- add patch to allow mockery 0.9.x + open https://github.com/swiftmailer/swiftmailer/pull/769 + * Mon May 2 2016 Remi Collet - 5.4.2-1 - update to 5.4.2 -- cgit