summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-zendframework-zend-permissions-rbac.spec30
1 files changed, 15 insertions, 15 deletions
diff --git a/php-zendframework-zend-permissions-rbac.spec b/php-zendframework-zend-permissions-rbac.spec
index 5a1119d..37d1bb2 100644
--- a/php-zendframework-zend-permissions-rbac.spec
+++ b/php-zendframework-zend-permissions-rbac.spec
@@ -21,7 +21,7 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 2.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Zend Framework Permissions/%{library} component
Group: Development/Libraries
@@ -41,21 +41,22 @@ BuildRequires: php-spl
# "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.3.23"
Requires: php(language) >= 5.3.23
+# Autoloader
+Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.5.1
Requires: php-spl
-# Autoloader
-Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5
Obsoletes: php-ZendFramework2-Permissions-%{library} < 2.5
Provides: php-ZendFramework2-Permissions-%{library} = %{version}
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
+Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
%description
@@ -72,7 +73,8 @@ mv LICENSE.md LICENSE
%build
-# Empty build section, nothing required
+: Generate autoloader
+phpab --template fedora --output src/autoload.php src
%install
@@ -83,16 +85,10 @@ cp -pr src %{buildroot}%{php_home}/Zend/Permissions/%{library}
%check
%if %{with_tests}
mkdir vendor
-cat << EOF | tee vendor/autoload.php
+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\\\\Permissions\\\\%{library}' => dirname(__DIR__).'/test/',
- 'Zend\\\\Permissions\\\\%{library}' => '%{buildroot}%{php_home}/Zend/Permissions/%{library}'
-))));
-require_once '%{php_home}/Zend/autoload.php';
+require_once '%{buildroot}%{php_home}/Zend/Permissions/%{library}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\Permissions\\%{library}\\', dirname(__DIR__) . '/test');
EOF
ret=0
@@ -112,11 +108,15 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
+%dir %{php_home}/Zend
%dir %{php_home}/Zend/Permissions
%{php_home}/Zend/Permissions/%{library}
%changelog
+* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.5.1-6
+- switch from zend-loader to fedora/autoloader
+
* Tue Oct 31 2017 Remi Collet <remi@remirepo.net> - 2.5.1-5
- fix FTBFS from Koschei, add patch for tests with PHP 7.2
https://github.com/zendframework/zend-permissions-rbac/pull/31