diff options
| -rw-r--r-- | php-zendframework-zend-uri.spec | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/php-zendframework-zend-uri.spec b/php-zendframework-zend-uri.spec index 4019983..80a9fd2 100644 --- a/php-zendframework-zend-uri.spec +++ b/php-zendframework-zend-uri.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-zendframework-zend-uri # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.5.2 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -36,16 +36,15 @@ BuildArch: noarch BuildRequires: php(language) >= 5.5 BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-composer(%{gh_owner}/zend-escaper) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.5 # From composer, "require-dev": { # "fabpot/php-cs-fixer": "1.7.*", # "phpunit/PHPUnit": "~4.0" BuildRequires: php-composer(phpunit/phpunit) >= 4.0 -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.5 || ^7.0", @@ -53,11 +52,13 @@ BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 # "zendframework/zend-validator": "^2.5" Requires: php(language) >= 5.5 %if ! %{bootstrap} -Requires: php-composer(%{gh_owner}/zend-escaper) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-escaper) < 3 -Requires: php-composer(%{gh_owner}/zend-validator) >= 2.5 -Requires: php-composer(%{gh_owner}/zend-validator) < 3 +Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 +Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3 +Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.5 +Requires: php-autoloader(%{gh_owner}/zend-validator) < 3 %endif +# Autoloader +Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.2 Requires: php-pcre Requires: php-spl @@ -65,6 +66,7 @@ Requires: php-spl Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} %description @@ -82,7 +84,14 @@ mv LICENSE.md LICENSE %build -# Empty build section, nothing required +: Create autoloader +phpab --template fedora --output src/autoload.php src +cat << 'EOF' | tee -a src/autoload.php +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/Zend/Escaper/autoload.php', + '%{php_home}/Zend/Validator/autoload.php', +]); +EOF %install @@ -95,14 +104,8 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require_once '%{php_home}/Zend/Loader/AutoloaderFactory.php'; -Zend\Loader\AutoloaderFactory::factory(array( - 'Zend\Loader\StandardAutoloader' => array( - 'namespaces' => array( - 'ZendTest\\%{library}' => dirname(__DIR__).'/test/', - 'Zend\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' -)))); -require_once '%{php_home}/Zend/autoload.php'; +require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); EOF ret=0 @@ -126,6 +129,9 @@ exit $ret %changelog +* Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 2.5.2-4 +- switch from zend-loader to fedora/autoloader + * Thu Feb 18 2016 Remi Collet <remi@fedoraproject.org> - 2.5.2-1 - update to 2.5.2 - raise dependency on PHP >= 5.5 |