From 1ba978a5574162c4f34e3ea078705c1fe5fb1b02 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Sep 2019 11:40:58 +0200 Subject: - update to 1.2.4 - drop patch merged upstream --- php-mockery.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'php-mockery.spec') diff --git a/php-mockery.spec b/php-mockery.spec index 2adae20..a4c1b05 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -7,7 +7,7 @@ # # Please preserve changelog entries # -%global gh_commit 4eff936d83eb809bde2c57a3cea0ee9643769031 +%global gh_commit b3453f75fd23d9fd41685f2148f4abeacabc6405 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -16,7 +16,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-mockery -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -26,8 +26,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Use our autoloader Patch0: %{gh_project}-tests.patch -# For 7.4 -Patch1: https://patch-diff.githubusercontent.com/raw/mockery/mockery/pull/993.patch BuildArch: noarch %if %{with_tests} @@ -93,7 +91,6 @@ cat << 'EOF' | tee -a library/%{ns_project}/autoload.php EOF %patch0 -p0 -b .rpm -%patch1 -p1 rm -f docs/.gitignore @@ -114,7 +111,6 @@ export COMPOSER_VENDOR_DIR=%{buildroot}%{_datadir}/php/%{ns_project}%{major} phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery -# TODO 7.4 Function is_real() is deprecated : Run upstream test suite ret=0 for cmd in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do @@ -144,6 +140,10 @@ exit $ret %changelog +* Mon Sep 30 2019 Remi Collet - 1.2.4-1 +- update to 1.2.4 +- drop patch merged upstream + * Mon Aug 19 2019 Remi Collet - 1.2.3-1 - update to 1.2.3 - add patch for PHP 7.4 from -- cgit