diff options
| -rw-r--r-- | composer.json | 55 | ||||
| -rw-r--r-- | php-laminas-permissions-rbac.spec | 110 |
2 files changed, 112 insertions, 53 deletions
diff --git a/composer.json b/composer.json index d9ed34a..a249b8a 100644 --- a/composer.json +++ b/composer.json @@ -1,36 +1,48 @@ { - "name": "zendframework/zend-permissions-rbac", - "description": "provides a role-based access control management", + "name": "laminas/laminas-permissions-rbac", + "description": "Provides a role-based access control management", "license": "BSD-3-Clause", "keywords": [ - "zf2", - "Rbac" + "laminas", + "laminas-permssions-rbac", + "rbac", + "authorization" ], - "homepage": "https://github.com/zendframework/zend-permissions-rbac", - "autoload": { - "psr-4": { - "Zend\\Permissions\\Rbac\\": "src/" - } + "homepage": "https://laminas.dev", + "support": { + "docs": "https://docs.laminas.dev/laminas-permissions-rbac/", + "issues": "https://github.com/laminas/laminas-permissions-rbac/issues", + "source": "https://github.com/laminas/laminas-permissions-rbac", + "rss": "https://github.com/laminas/laminas-permissions-rbac/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" }, - "require": { - "php": "^5.6 || ^7.0" + "config": { + "sort-packages": true }, - "minimum-stability": "dev", - "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "3.0.x-dev", + "dev-develop": "3.1.x-dev" } }, - "autoload-dev": { + "require": { + "php": "^7.1", + "laminas/laminas-zendframework-bridge": "^1.0" + }, + "require-dev": { + "laminas/laminas-coding-standard": "~1.0.0", + "phpunit/phpunit": "^7.0.1" + }, + "autoload": { "psr-4": { - "ZendTest\\Permissions\\Rbac\\": "test/" + "Laminas\\Permissions\\Rbac\\": "src/" } }, - "require-dev": { - "phpunit/phpunit": "^5.7.15|| ^6.2.1", - "zendframework/zend-coding-standard": "~1.0.0" + "autoload-dev": { + "psr-4": { + "LaminasTest\\Permissions\\Rbac\\": "test/" + } }, "scripts": { "check": [ @@ -41,5 +53,8 @@ "cs-fix": "phpcbf", "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "replace": { + "zendframework/zend-permissions-rbac": "self.version" } } diff --git a/php-laminas-permissions-rbac.spec b/php-laminas-permissions-rbac.spec index e5fe119..fba2051 100644 --- a/php-laminas-permissions-rbac.spec +++ b/php-laminas-permissions-rbac.spec @@ -1,31 +1,34 @@ -# remirepo/Fedora spec file for php-zendframework-zend-permissions-rbac +# remirepo/Fedora spec file for php-laminas-permissions-rbac # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c10ad55e50f402bf14eb2eb9bc424dd9a44dfc78 +%global gh_commit 82757287735fc5c3d437aa59de65d61fe7d6b16c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-permissions-rbac +%global gh_owner laminas +%global gh_project laminas-permissions-rbac +%global zf_name zend-permissions-rbac %global php_home %{_datadir}/php -%global library Rbac +%global namespace Laminas +%global library Permissions +%global subproj Rbac %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 +Name: php-%{gh_project} +Version: 3.0.2 Release: 1%{?dist} -Summary: Zend Framework Permissions/%{library} component +Summary: %{namespace} Framework %{Permissions}/%{Rbac} 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,40 +37,53 @@ BuildArch: noarch %if %{with_tests} BuildRequires: php(language) >= 5.6 BuildRequires: php-spl -# From composer, "require-dev": { -# "phpunit/phpunit": "^5.7.15|| ^6.2.1", -# "zendframework/zend-coding-standard": "~1.0.0" # remirepo:1 -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.2.1 -# remirepo:4 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +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", +# "phpunit/phpunit": "^7.0.1" +# remirepo:3 %else -%global phpunit %{_bindir}/phpunit -BuildRequires: php-phpunit-PHPUnit >= 5.7.21 +BuildRequires: php-laminas-zendframework-bridge %endif +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.0.1 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0" -Requires: php(language) >= 5.6 +# "php": "^7.1", +# "laminas/laminas-zendframework-bridge": "^1.0" +Requires: php(language) >= 7.1 +# 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) +# remirepo:3 +%else +Requires: php-laminas-zendframework-bridge +%endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.1 +# From phpcompatinfo report for version 3.0.2 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} < 3 +Provides: php-zendframework-%{zf_name} = %{version} +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 role-based access control (RBAC) permissions management. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -80,10 +96,24 @@ mv LICENSE.md LICENSE : Generate autoloader phpab --template fedora --output src/autoload.php src +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 @@ -91,15 +121,22 @@ 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}\\Role") ? 0 : 1); +' + +: upstream test suite ret=0 -for cmd in "php %{phpunit}" php70 php71 php72; do +for cmd in "php %{phpunit}" php72 php73 php74; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit6} \ + $1 ${2:-%{_bindir}/phpunit7} \ --verbose || ret=1 fi done @@ -110,16 +147,23 @@ 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 +* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 3.0.2-1 +- update to 3.0.2 +- switch to Laminas +- raise dependency on PHP 7.1 + * Thu Feb 1 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1 - Update to 2.6.0 - raise dependency on PHP 5.6 |