From f930b4ebc852a8341a2cebfc5d89ea84971e331b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Dec 2017 09:39:52 +0100 Subject: use Archive_Tar autoloader --- php-zendframework-zend-filter.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/php-zendframework-zend-filter.spec b/php-zendframework-zend-filter.spec index fc3abf5..7e572d1 100644 --- a/php-zendframework-zend-filter.spec +++ b/php-zendframework-zend-filter.spec @@ -22,7 +22,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.7.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -50,7 +50,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # "zendframework/zend-uri": "^2.5", # "phpunit/PHPUnit": "^6.0.10 || ^5.7.17", # "zendframework/zend-coding-standard": "~1.0.0" -BuildRequires: php-composer(pear/archive_tar) >= 1.4 +BuildRequires: php-autoloader(pear/archive_tar) >= 1.4 BuildRequires: php-autoloader(%{gh_owner}/zend-crypt) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-uri) >= 2.5 @@ -124,9 +124,8 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Zend/I18n/autoload.php', '%{php_home}/Zend/ServiceManager/autoload.php', '%{php_home}/Zend/Uri/autoload.php', + '%{_datadir}/pear/Archive/Tar/autoload.php', ]); -// For Archive_Tar -\Fedora\Autoloader\Autoload::addPsr0('', '%{_datadir}/pear'); EOF @@ -148,7 +147,7 @@ EOF rm test/Compress/SnappyTest.php ret=0 -for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6"; do +for cmd in "php %{phpunit}" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6"; do if which $cmd; then set $cmd $1 $2 || ret=1 @@ -169,6 +168,9 @@ exit $ret %changelog +* Tue Dec 19 2017 Remi Collet - 2.7.2-4 +- use Archive_Tar autoloader + * Thu Dec 7 2017 Remi Collet - 2.7.2-3 - switch from zend-loader to fedora/autoloader -- cgit