diff options
| -rw-r--r-- | php-phpunit-mock-objects5.spec | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/php-phpunit-mock-objects5.spec b/php-phpunit-mock-objects5.spec index 2b4e0e3..cbc28ed 100644 --- a/php-phpunit-mock-objects5.spec +++ b/php-phpunit-mock-objects5.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global bootstrap 0 +%global bootstrap 1 # Github %global gh_commit 33fd41a76e746b8fa96d00b49a23dadfa8334cdf #global gh_date 20150902 @@ -24,7 +24,7 @@ %global ver_major 5 %global ver_minor 0 %global ver_patch 6 -%global specrel 1 +%global specrel 0 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -43,6 +43,8 @@ Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi # Temporary workaround, under investigation Patch0: %{name}-rpm.patch +# Upstream +Patch1: https://github.com/sebastianbergmann/phpunit-mock-objects/commit/e244c19aec6a1f0a2ff9e498b9b4bed22537730a.patch BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -97,6 +99,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_top}/%{ns_project}%{ver_major}/autoloa %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p0 +%patch1 -p1 find . -name \*.orig -exec rm {} \; -print @@ -158,7 +161,7 @@ exit $ret %changelog * Sun Jan 7 2018 Remi Collet <remi@remirepo.net> - 5.0.6-1 - Update to 5.0.6 -- open issue for test failure with PHP 7.0 +- add upstream patch for test failure with PHP 7.0, see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/398 * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 5.0.5-1 |