From 7757f6c031ef98948e579488b842c235e4080d71 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Nov 2017 13:27:43 +0100 Subject: fix FTBFS from Koschei, add upstream patch --- php-phpunit-mock-objects4.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'php-phpunit-mock-objects4.spec') diff --git a/php-phpunit-mock-objects4.spec b/php-phpunit-mock-objects4.spec index 232e003..33b2876 100644 --- a/php-phpunit-mock-objects4.spec +++ b/php-phpunit-mock-objects4.spec @@ -24,7 +24,7 @@ %global ver_major 4 %global ver_minor 0 %global ver_patch 4 -%global specrel 1 +%global specrel 2 %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -43,6 +43,7 @@ Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commi # Temporary workaround, under investigation Patch0: %{gh_project}-4.0.0-rpm.patch +Patch1: a669a8e3569e62e542812e0620f3d0f7e53870b2.patch BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -55,8 +56,8 @@ BuildRequires: php-composer(doctrine/instantiator) >= 1.0.5 BuildRequires: php-composer(sebastian/exporter) < 4 BuildRequires: php-composer(sebastian/exporter) >= 3.0 # From composer.json, "require-dev": { -# "phpunit/phpunit": "^6.0" -BuildRequires: phpunit6 +# "phpunit/phpunit": "^6.4.3" +BuildRequires: phpunit6 >= 6.4.3 %endif # From composer.json, "require": { @@ -95,6 +96,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_top}/%{ns_project}/autoload.php %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p0 +%patch1 -p1 find . -name \*.orig -exec rm {} \; -print @@ -151,6 +153,9 @@ exit $ret %changelog +* Fri Nov 3 2017 Remi Collet - 4.0.4-2 +- fix FTBFS from Koschei, add upstream patch + * Fri Aug 4 2017 Remi Collet - 4.0.4-1 - Update to 4.0.4 - raise dependency on phpunit/php-text-template 1.2.1 -- cgit