summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e244c19aec6a1f0a2ff9e498b9b4bed22537730a.patch22
-rw-r--r--php-phpunit-mock-objects5.spec20
2 files changed, 12 insertions, 30 deletions
diff --git a/e244c19aec6a1f0a2ff9e498b9b4bed22537730a.patch b/e244c19aec6a1f0a2ff9e498b9b4bed22537730a.patch
deleted file mode 100644
index 42c902f..0000000
--- a/e244c19aec6a1f0a2ff9e498b9b4bed22537730a.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e244c19aec6a1f0a2ff9e498b9b4bed22537730a Mon Sep 17 00:00:00 2001
-From: Sebastian Bergmann <sb@sebastian-bergmann.de>
-Date: Sun, 7 Jan 2018 18:10:51 +0100
-Subject: [PATCH] Closes #398
-
----
- tests/Generator/397.phpt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/Generator/397.phpt b/tests/Generator/397.phpt
-index 1259e6f..71e32a4 100644
---- a/tests/Generator/397.phpt
-+++ b/tests/Generator/397.phpt
-@@ -1,5 +1,8 @@
- --TEST--
- https://github.com/sebastianbergmann/phpunit-mock-objects/issues/397
-+--SKIPIF--
-+<?php
-+if (!version_compare(PHP_VERSION, '7.1', '>=')) print 'skip: PHP >= 7.1 required';
- --FILE--
- <?php
- class C
diff --git a/php-phpunit-mock-objects5.spec b/php-phpunit-mock-objects5.spec
index 54440a5..45f968f 100644
--- a/php-phpunit-mock-objects5.spec
+++ b/php-phpunit-mock-objects5.spec
@@ -8,7 +8,7 @@
#
%global bootstrap 0
# Github
-%global gh_commit 33fd41a76e746b8fa96d00b49a23dadfa8334cdf
+%global gh_commit 3eaf040f20154d27d6da59ca2c6e28ac8fd56dce
#global gh_date 20150902
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -23,8 +23,8 @@
%global php_home %{_datadir}/php
%global ver_major 5
%global ver_minor 0
-%global ver_patch 6
-%global specrel 3
+%global ver_patch 7
+%global specrel 1
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
%else
@@ -43,17 +43,17 @@ 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
%if %{with_tests}
BuildRequires: php(language) >= 7.0
-%if 0%{?fedora} >= 27
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
BuildRequires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
+# remirepo:5
%else
BuildRequires: php-phpunit-Text-Template >= 1.2.1
BuildRequires: php-doctrine-instantiator >= 1.0.5
@@ -70,10 +70,12 @@ BuildRequires: phpunit6 >= 6.5
# "doctrine/instantiator": "^1.0.5",
# "sebastian/exporter": "^3.1"
Requires: php(language) >= 7.0
-%if 0%{?fedora} >= 27
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
Requires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
+# remirepo:5
%else
Requires: php-phpunit-Text-Template >= 1.2.1
Requires: php-doctrine-instantiator >= 1.0.5
@@ -105,7 +107,6 @@ 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
@@ -167,6 +168,9 @@ exit $ret
%changelog
+* Wed May 30 2018 Remi Collet <remi@remirepo.net> - 5.0.7-1
+- update to 5.0.7
+
* Wed Feb 7 2018 Remi Collet <remi@remirepo.net> - 5.0.6-3
- normal build