From e8522c8334296ed64f431127c34af70e71a034b6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Sep 2020 07:07:13 +0200 Subject: v2.7.2 --- composer.json | 6 +----- php-laminas-permissions-acl.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 45e09b8..b195f9a 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,6 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" - } }, "require": { "php": "^5.6 || ^7.0", @@ -57,6 +53,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-permissions-acl": "self.version" + "zendframework/zend-permissions-acl": "^2.7.1" } } diff --git a/php-laminas-permissions-acl.spec b/php-laminas-permissions-acl.spec index 628b52f..0a655e9 100644 --- a/php-laminas-permissions-acl.spec +++ b/php-laminas-permissions-acl.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 624567fe376a70e0bfb5aa8217d5afa13b9d6e61 +%global gh_commit d8cd35ed94eef5d3d2533af4a72cf1c2932084bb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-permissions-acl @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project} -Version: 2.7.1 +Version: 2.7.2 Release: 1%{?dist} Summary: %{namespace} Framework %{library}/%{subproj} component @@ -82,8 +82,8 @@ Requires: php-spl Obsoletes: php-ZendFramework2-Permissions-%{library} < 2.5 Provides: php-ZendFramework2-Permissions-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.7.1-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.7.2 +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} @@ -173,6 +173,9 @@ exit $ret %changelog +* Wed Sep 23 2020 Remi Collet - 2.7.2-1 +- update to 2.7.2 + * Tue Jan 14 2020 Remi Collet - 2.7.1-1 - switch to Laminas -- cgit