diff options
| -rw-r--r-- | composer.json | 13 | ||||
| -rw-r--r-- | php-laminas-servicemanager.spec | 30 |
2 files changed, 23 insertions, 20 deletions
diff --git a/composer.json b/composer.json index 289670d..4b87171 100644 --- a/composer.json +++ b/composer.json @@ -26,18 +26,21 @@ }, "sort-packages": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true, + "composer/package-versions-deprecated": true, + "laminas/laminas-dependency-plugin": true } }, "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0", - "composer-plugin-api": "^2.0", "laminas/laminas-stdlib": "^3.2.1", - "psr/container": "^1.1 || ^2.0.2" + "psr/container": "^1.0" }, "require-dev": { + "composer/package-versions-deprecated": "^1.0", "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-container-config-test": "^0.6", + "laminas/laminas-container-config-test": "^0.7", + "laminas/laminas-dependency-plugin": "^2.1.2", "mikey179/vfsstream": "^1.6.10@alpha", "ocramius/proxy-manager": "^2.11", "phpbench/phpbench": "^1.1", @@ -47,7 +50,7 @@ "vimeo/psalm": "^4.8" }, "provide": { - "psr/container-implementation": "^1.1 || ^2.0" + "psr/container-implementation": "^1.0" }, "conflict": { "ext-psr": "*", diff --git a/php-laminas-servicemanager.spec b/php-laminas-servicemanager.spec index 6e66814..6421f6d 100644 --- a/php-laminas-servicemanager.spec +++ b/php-laminas-servicemanager.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 65910ef6a8066b0369fab77fbec9e030be59c866 +%global gh_commit 863c66733740cd36ebf5e700f4258ef2c68a2a24 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-servicemanager @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 3.15.0 +Version: 3.16.0 Release: 1%{?dist} Summary: Laminas Framework %{library} component @@ -31,9 +31,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -# drop Composer\InstalledVersions usage -Patch0: %{name}-rpm.patch - BuildArch: noarch # Tests %if %{with_tests} @@ -41,7 +38,7 @@ BuildRequires: php(language) >= 7. # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) -BuildRequires: (php-composer(psr/container) >= 1.1 with php-composer(psr/container) < 3) +BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) # remirepo:5 %else @@ -54,8 +51,10 @@ BuildRequires: php-date BuildRequires: php-json BuildRequires: php-spl # From composer, "require-dev": { +# "composer/package-versions-deprecated": "^1.0", # "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-container-config-test": "^0.6", +# "laminas/laminas-dependency-plugin": "^2.1.2", # "mikey179/vfsstream": "^1.6.10@alpha", # "ocramius/proxy-manager": "^2.11", # "phpbench/phpbench": "^1.1", @@ -84,15 +83,14 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "~7.4.0 || ~8.0.0 || ~8.1.0", -# "composer-plugin-api": "^2.0", # "laminas/laminas-stdlib": "^3.2.1", -# "psr/container": "^1.1 || ^2.0.2" +# "psr/container": "^1.0" Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) -Requires: (php-composer(psr/container) >= 1.1 with php-composer(psr/container) < 3) +Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) # remirepo:5 %else Requires: php-laminas-stdlib >= 3.2.1 @@ -130,7 +128,6 @@ Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} Provides: php-autoloader(zendframework/%{zf_name}) = %{version} Provides: php-composer(psr/container-implementation) = 1.0 -Provides: php-composer(psr/container-implementation) = 2.0 %description @@ -143,7 +140,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv src/autoload.php src/_autoload.php mv LICENSE.md LICENSE @@ -154,10 +150,7 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - [ - '%{php_home}/Psr/Container2/autoload.php', - '%{php_home}/Psr/Container/autoload.php', - ], + '%{php_home}/Psr/Container/autoload.php', '%{php_home}/%{namespace}/Stdlib/autoload.php', __DIR__ . '/_autoload.php', ]); @@ -233,6 +226,13 @@ exit $ret %changelog +* Thu Jul 28 2022 Remi Collet <remi@remirepo.net> - 3.16.0-1 +- update to 3.16.0 (no change) + +* Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 3.15.1-1 +- update to 3.15.1 +- drop support for psr/container version 2 + * Tue Jul 19 2022 Remi Collet <remi@remirepo.net> - 3.15.0-1 - update to 3.15.0 - raise dependency on psr/container 1.1 and allow version 2 |