diff options
| -rw-r--r-- | composer.json | 54 | ||||
| -rw-r--r-- | php-laminas-permissions-acl.spec | 115 |
2 files changed, 108 insertions, 61 deletions
diff --git a/composer.json b/composer.json index fc40fde..45e09b8 100644 --- a/composer.json +++ b/composer.json @@ -1,48 +1,49 @@ { - "name": "zendframework/zend-permissions-acl", + "name": "laminas/laminas-permissions-acl", "description": "Provides a lightweight and flexible access control list (ACL) implementation for privileges management", "license": "BSD-3-Clause", "keywords": [ - "zf", - "zendframework", + "laminas", "acl" ], + "homepage": "https://laminas.dev", "support": { - "docs": "https://docs.zendframework.com/zend-permissions-acl/", - "issues": "https://github.com/zendframework/zend-permissions-acl/issues", - "source": "https://github.com/zendframework/zend-permissions-acl", - "rss": "https://github.com/zendframework/zend-permissions-acl/releases.atom", - "chat": "https://zendframework-slack.herokuapp.com", - "forum": "https://discourse.zendframework.com/c/questions/components" + "docs": "https://docs.laminas.dev/laminas-permissions-acl/", + "issues": "https://github.com/laminas/laminas-permissions-acl/issues", + "source": "https://github.com/laminas/laminas-permissions-acl", + "rss": "https://github.com/laminas/laminas-permissions-acl/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.6 || ^7.0", + "laminas/laminas-zendframework-bridge": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", - "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + "laminas/laminas-coding-standard": "~1.0.0", + "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5" }, "suggest": { - "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" + "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" }, "autoload": { "psr-4": { - "Zend\\Permissions\\Acl\\": "src/" + "Laminas\\Permissions\\Acl\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Permissions\\Acl\\": "test/" - } - }, - "config": { - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "LaminasTest\\Permissions\\Acl\\": "test/" } }, "scripts": { @@ -54,5 +55,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-permissions-acl": "self.version" } } diff --git a/php-laminas-permissions-acl.spec b/php-laminas-permissions-acl.spec index 79366ea..628b52f 100644 --- a/php-laminas-permissions-acl.spec +++ b/php-laminas-permissions-acl.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for zend-permissions-acl +# remirepo/Fedora spec file for php-laminas-permissions-acl # # Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA @@ -7,25 +7,28 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1323e30a9357e6f6956f63d97faf7e8c8db1f4f8 +%global gh_commit 624567fe376a70e0bfb5aa8217d5afa13b9d6e61 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-permissions-acl +%global gh_owner laminas +%global gh_project laminas-permissions-acl +%global zf_name zend-permissions-acl %global php_home %{_datadir}/php -%global library Acl +%global namespace Laminas +%global library Permissions +%global subproj Acl %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.7.1 -Release: 2%{?dist} -Summary: Zend Framework Permissions-%{library} component +Release: 1%{?dist} +Summary: %{namespace} Framework %{library}/%{subproj} component License: BSD -URL: https://zendframework.github.io/%{gh_project}/ +URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -34,50 +37,64 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-spl -# From composer, "require-dev": { -# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", -# "zendframework/zend-coding-standard": "~1.0.0", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 >= 7.1.4 -# remirepo:6 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) +# From composer, "require-dev": { +# "laminas/laminas-coding-standard": "~1.0.0", +# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +# remirepo:4 %else -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.5.8 +BuildRequires: php-laminas-zendframework-bridge +BuildRequires: php-laminas-servicemanager %endif +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.5 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0" +# "php": "^5.6 || ^7.0", +# "laminas/laminas-zendframework-bridge": "^1.0" Requires: php(language) >= 5.6 %if ! %{bootstrap} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "suggest": { -# "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" -Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) +# "laminas/laminas-servicemanager": "To support Laminas\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage" +Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) +# remirepo:3 +%else +Requires: php-laminas-zendframework-bridge +%endif %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.1 +# From phpcompatinfo report for version 2.7.1 +Requires: php-reflection +Requires: php-pcre Requires: php-spl Obsoletes: php-ZendFramework2-Permissions-%{library} < 2.5 Provides: php-ZendFramework2-Permissions-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.7.1-99 +Provides: php-zendframework-%{zf_name} = %{version}-99 +Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-autoloader(zendframework/%{zf_name}) = %{version} %description Provides a lightweight and flexible access control list (ACL) implementation for privileges management. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -90,14 +107,28 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/ServiceManager/autoload.php', +]); +EOF + +cat << 'EOF' | tee zf.php +<?php +require_once '%{php_home}/Fedora/Autoloader/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', + dirname(dirname(dirname(__DIR__))) . '/%{namespace}/%{library}/%{subproj}/autoload.php', ]); EOF %install -mkdir -p %{buildroot}%{php_home}/Zend/Permissions/ -cp -pr src %{buildroot}%{php_home}/Zend/Permissions/%{library} +: Laminas library +mkdir -p %{buildroot}%{php_home}/%{namespace}/%{library}/ +cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj} + +: Zend equiv +mkdir -p %{buildroot}%{php_home}/Zend/%{library}/%{subproj} +cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php %check @@ -105,12 +136,19 @@ cp -pr src %{buildroot}%{php_home}/Zend/Permissions/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require_once '%{buildroot}%{php_home}/Zend/Permissions/%{library}/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\Permissions\\%{library}\\', dirname(__DIR__) . '/test'); +require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\%{subproj}\\', dirname(__DIR__) . '/test'); EOF +: check compat autoloader +php -r ' +require "%{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php"; +exit (class_exists("\\Zend\\%{library}\\%{subproj}\\Acl") ? 0 : 1); +' + +: upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do +for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -123,16 +161,21 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json -%dir %{php_home}/Zend -%dir %{php_home}/Zend/Permissions - %{php_home}/Zend/Permissions/%{library} +%dir %{php_home}/Zend/%{library} + %{php_home}/Zend/%{library}/%{subproj} +%dir %{php_home}/%{namespace}/%{library} + %{php_home}/%{namespace}/%{library}/%{subproj} %changelog +* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 2.7.1-1 +- switch to Laminas + * Tue Jun 25 2019 Remi Collet <remi@remirepo.net> - 2.7.1-1 - update to 2.7.1 |