From fb62ad449af3a59b71eb219c90ce1dbaf33f7d5d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 6 Oct 2017 15:29:09 +0200
Subject: add patches for PHP 7.2

---
 php-deepend-Mockery.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'php-deepend-Mockery.spec')

diff --git a/php-deepend-Mockery.spec b/php-deepend-Mockery.spec
index c8435ef..818a9bd 100644
--- a/php-deepend-Mockery.spec
+++ b/php-deepend-Mockery.spec
@@ -15,7 +15,7 @@
 
 Name:           php-deepend-Mockery
 Version:        0.9.9
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
 Group:          Development/Libraries
@@ -28,8 +28,9 @@ Source1:        %{gh_project}-autoload.php
 
 # Use our autoloader
 Patch0:         %{gh_project}-tests.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Upstream patch for 7.2
+Patch1:         https://github.com/mockery/mockery/commit/b2f20b33942c2c84bc3b3b169098b448b3e66737.patch
+Patch2:         https://patch-diff.githubusercontent.com/raw/mockery/mockery/pull/798.patch
 
 BuildArch:      noarch
 %if %{with_tests}
@@ -75,6 +76,8 @@ To use this library, you just have to add, in your project:
 
 cp %{SOURCE1} library/Mockery/autoload.php
 %patch0 -p0 -b .rpm
+%patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -82,16 +85,10 @@ cp %{SOURCE1} library/Mockery/autoload.php
 
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}/%{_datadir}/php
 cp -rp library/* %{buildroot}/%{_datadir}/php/
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %check
 %if %{with_tests}
 : Use installed tree and our autoloader
@@ -99,7 +96,7 @@ sed -e 's:@BUILD@:%{buildroot}/%{_datadir}/php:' -i tests/Bootstrap.php
 
 : Run upstream test suite
 ret=0
-for cmd in php56 php70 php71 php; do
+for cmd in php php56 php70 php71 php72; do
    if which $cmd; then
       $cmd %{_bindir}/phpunit --verbose || ret=1
    fi
@@ -116,7 +113,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md docs
@@ -126,6 +122,9 @@ fi
 
 
 %changelog
+* Fri Oct  6 2017 Remi Collet <remi@remirepo.net> - 0.9.9-4
+- add patches for PHP 7.2
+
 * Tue Feb 28 2017 Remi Collet <remi@remirepo.net> - 0.9.9-1
 - Update to 0.9.9
 
-- 
cgit