diff --git a/.gitignore b/.gitignore index c6ceb7d..4e3faef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-symfony-contracts-1.1.7-9cb5249.tar.gz /php-symfony-contracts-1.1.8-f51bca9.tar.gz /php-symfony-contracts-1.1.10-011c204.tar.gz +/php-symfony-contracts-1.1.11-cf2984f.tar.gz diff --git a/php-symfony-contracts.spec b/php-symfony-contracts.spec index 5e3f32a..4d0cd3b 100644 --- a/php-symfony-contracts.spec +++ b/php-symfony-contracts.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 011c20407c4b99d454f44021d023fb39ce23b73d +%global gh_commit cf2984f7a99bfae197f9c96f5a16a4041ff6ffb1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner symfony %global gh_project contracts @@ -21,8 +21,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.1.10 -Release: 3%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} +Version: 1.1.11 +Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: A set of abstractions extracted out of the Symfony License: MIT @@ -40,7 +40,7 @@ BuildRequires: php-spl BuildRequires: php-intl # From composer.json, "require-dev": { # "symfony/polyfill-intl-idn": "^1.10" -BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) +BuildRequires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 4) BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) %global phpunit %{_bindir}/phpunit7 BuildRequires: %{phpunit} @@ -50,7 +50,7 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=7.1.3" -# "psr/cache": "^1.0", +# "psr/cache": "^1.0|^2.0|^3.0", # "psr/container": "^1.0" Requires: php(language) >= 7.1.3 # From composer.json, "suggest": { @@ -60,7 +60,7 @@ Requires: php(language) >= 7.1.3 # "symfony/http-client-implementation": "", # "symfony/service-implementation": "", # "symfony/translation-implementation": "" -Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 2) +Requires: (php-composer(psr/cache) >= 1.0 with php-composer(psr/cache) < 4) Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) Recommends: (php-composer(psr/event-dispatcher) >= 1.0 with php-composer(psr/event-dispatcher) < 2) # From phpcompatinfo report for version 1.1.0 @@ -107,7 +107,11 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__); \Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Psr/Cache/autoload.php', + [ + '%{php_home}/Psr/Cache3/autoload.php', + '%{php_home}/Psr/Cache2/autoload.php', + '%{php_home}/Psr/Cache/autoload.php', + ], '%{php_home}/Psr/Container/autoload.php', '%{php_home}/Psr/EventDispatcher/autoload.php', ]); @@ -129,10 +133,11 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 1.1.11-1 +- update to 1.1.11 +- allow psr/cache v2 and v3 + * Fri Jul 23 2021 Fedora Release Engineering - 1.1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 274bcca..f30c53f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-symfony-contracts-1.1.10-011c204.tar.gz) = 1d6d49de111edc3df33e4dec6051b8ed85f435a7d9d15f7282d14227b272da6c4b477b2e5e84dbef48280e96758c56cc4834dfd9e273e6178f2b551b2b4894e0 +SHA512 (php-symfony-contracts-1.1.11-cf2984f.tar.gz) = 3809e9d8cbc9587c486293c7d54e6f0ee5762bf6983ff962a1a3fcaf6c725cc7f30ae6dcf3aea40e8e04e1ad4de00c3eb8fb45abebb35c412331b07b665470cd