From 8e20f40f745dd48ac80e66461dd1fe13ef17b346 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Feb 2020 15:02:01 +0100 Subject: disable test suite where mockery < 1 is broken --- php-swiftmailer6.spec | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/php-swiftmailer6.spec b/php-swiftmailer6.spec index dc0de06..42327f6 100644 --- a/php-swiftmailer6.spec +++ b/php-swiftmailer6.spec @@ -1,23 +1,28 @@ # remirepo/fedora spec file for php-swiftmailer6 # -# Copyright (c) 2016-2019 Remi Collet +# Copyright (c) 2016-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please preserve changelog entries # -%global gh_commit 5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a +%global gh_commit 149cfdf118b169f7840bbe3ef0d4bc795d1780c9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swiftmailer %global gh_project swiftmailer # don't change major version used in package name %global major 6 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 +# disable test by default, without mockery < 1 +%global with_tests 0%{?_with_tests:1} +%else %global with_tests 0%{!?_without_tests:1} +%endif %global php_home %{_datadir}/php Name: php-%{gh_project}%{major} -Version: 6.2.1 -Release: 1%{?dist} +Version: 6.2.3 +Release: 3%{?dist} Summary: Free Feature-rich PHP Mailer License: MIT @@ -48,7 +53,6 @@ BuildRequires: php-openssl BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: phpunit6 -BuildRequires: php-fedora-autoloader-devel # From composer.json, "require-dev": { # "mockery/mockery": "~0.9.1", # "symfony/phpunit-bridge": "^3.4.19|^4.1.8" @@ -62,6 +66,7 @@ BuildRequires: php-deepend-Mockery >= 0.9.1 BuildRequires: php-symfony3-phpunit-bridge >= 3.4.19 %endif %endif +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { # "php": ">=7.0.0", @@ -161,15 +166,22 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE -%doc CHANGES README +%doc CHANGES README.md %doc doc %doc composer.json %{php_home}/Swift%{major} %changelog +* Mon Feb 24 2020 Remi Collet - 6.2.3-3 +- disable test suite where mockery < 1 is broken + +* Tue Nov 12 2019 Remi Collet - 6.2.3-1 +- update to 6.2.3 + * Tue Apr 23 2019 Remi Collet - 6.2.1-1 - update to 6.2.1 -- cgit