From 49e2067b131c60708bdde277d952df04e385d68d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Feb 2020 09:50:52 +0100 Subject: sync with Fedora --- php-ocramius-proxy-manager.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/php-ocramius-proxy-manager.spec b/php-ocramius-proxy-manager.spec index 3d6520f..3473e75 100644 --- a/php-ocramius-proxy-manager.spec +++ b/php-ocramius-proxy-manager.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-ocramius-proxy-manager # -# Copyright (c) 2015-2019 Shawn Iwinski +# Copyright (c) 2015-2020 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -32,7 +32,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: OOP proxy wrappers utilities License: MIT @@ -150,10 +150,15 @@ cat << 'EOF' | tee -a vendor/autoload.php require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php'; EOF +: Zend => Laminas +if [ -d /usr/share/php/Laminas ] +then sed -i "s/'Zend/'Laminas/" \ + tests/ProxyManagerTest/ProxyGenerator/RemoteObject/MethodGenerator/RemoteObjectMethodTest.php +fi + : Run tests -# TODO 7.4 RETURN_CODE=0 -for PHP_EXEC in php php72 php73; do +for PHP_EXEC in php php72 php73 php74; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit6 --verbose \ || RETURN_CODE=1 @@ -175,6 +180,9 @@ exit $RETURN_CODE %changelog +* Sun Feb 23 2020 Shawn Iwinski - 2.2.2-3 +- Fix FTBFS (RHDB #1799874) + * Thu Aug 29 2019 Remi Collet - 2.2.2-1 - update to 2.2.2 - use zendframework component autoloaders instead of framework one -- cgit