From b015d058e929910fc4ad9289a12ce7314122a860 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jan 2021 11:48:29 +0100 Subject: update to 4.4.19 drop dependency on ocramius/proxy-manager add dependency on friendsofphp/proxy-manager-lts raise dependency on doctrine_annotations_min_ver 1.10.4 raise dependency on doctrine/orm 2.6.3 raise dependency on twig/twig 1.43 sources from git snapshot --- php-symfony4.spec | 55 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 20 deletions(-) (limited to 'php-symfony4.spec') diff --git a/php-symfony4.spec b/php-symfony4.spec index 39845cc..a51e2ed 100644 --- a/php-symfony4.spec +++ b/php-symfony4.spec @@ -13,8 +13,9 @@ %global github_owner symfony %global github_name symfony -%global github_version 4.4.18 -%global github_commit a05cc024d3d43cb84faea3969de8cc2e590e7a83 +%global github_version 4.4.19 +%global github_commit c2c71dee2c322a4079120d819a5b3b60a96e4b6f +%global github_short %(c=%{github_commit}; echo ${c:0:7}) %global composer_vendor symfony %global composer_project symfony @@ -25,8 +26,8 @@ # NOTE: Min and max versions added to restrict to single major version %global cache_integration_tests_min_ver 0 %global cache_integration_tests_max_ver 1 -# "doctrine/annotations": "~1.7" -%global doctrine_annotations_min_ver 1.7 +# "doctrine/annotations": "~1.10.4" +%global doctrine_annotations_min_ver 1.10.4 %global doctrine_annotations_max_ver 2.0 # "doctrine/cache": "~1.6" %global doctrine_cache_min_ver 1.6 @@ -50,8 +51,8 @@ # "doctrine/doctrine-bundle": "^1.5|^2.0" %global doctrine_bundle_min_ver 1.5 %global doctrine_bundle_max_ver 3 -# "doctrine/orm": "~2.4,>=2.4.5" -%global doctrine_orm_min_ver 2.4.5 +# "doctrine/orm": "^2.6.3" +%global doctrine_orm_min_ver 2.6.3 %global doctrine_orm_max_ver 3.0 # "egulias/email-validator": "^2.1.10" %global email_validator_min_ver 2.1.10 @@ -62,9 +63,9 @@ # "monolog/monolog": "^1.25.1" %global monolog_min_ver 1.25.1 %global monolog_max_ver 2.0 -# "ocramius/proxy-manager": "~2.1" -%global proxy_manager_min_ver 2.1 -%global proxy_manager_max_ver 3.0 +# "friendsofphp/proxy-manager-lts": "^1.0.2" +%global proxy_manager_min_ver 1.0.2 +%global proxy_manager_max_ver 2 # "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0" # conflicts: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2" %global phpdocumentor_reflection_docblock_min_ver 3.2.2 @@ -99,8 +100,8 @@ # "symfony/*-contracts": "~1.1.10" %global symfony_contracts_min_ver 1.1.10 %global symfony_contracts_max_ver 2 -# "twig/twig": "^1.41|^2.10|^3.0" -%global twig_min_ver 1.41 +# "twig/twig": "^1.43|^2.13|^3.0.4" +%global twig_min_ver 1.43 %global twig_max_ver 4.0 # "masterminds/html5": "^2.6" %global masterminds_min_ver 2.6 @@ -148,8 +149,10 @@ Summary: Symfony PHP framework (version 4) # - All other bridges/bundles/components License: MIT and CC-BY-SA URL: https://symfony.com -Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz +Source0: %{name}-%{github_version}-%{github_short}.tgz Source1: %{name}-generate-autoloaders.php +# git snapshot to retrieve everything +Source2: makesrc.sh # Use our autoloader Patch0: %{name}-autoload.patch @@ -176,7 +179,7 @@ BuildRequires:(php-composer(masterminds/html5) >= %{masterminds_ BuildRequires:(php-composer(mongodb/mongodb) >= %{mongodb_min_ver} with php-composer(mongodb/mongodb) < %{mongodb_max_ver}) BuildRequires:(php-composer(monolog/monolog) >= %{monolog_min_ver} with php-composer(monolog/monolog) < %{monolog_max_ver}) BuildRequires:(php-composer(nyholm/psr7) >= %{nyholm_psr7_min_ver} with php-composer(nyholm/psr7) < %{nyholm_psr7_max_ver}) -BuildRequires:(php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver}) +BuildRequires:(php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} with php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver}) BuildRequires:(php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver} with php-composer(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver}) BuildRequires:(php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) BuildRequires:(php-composer(psr/container) >= %{psr_container_min_ver} with php-composer(psr/container) < %{psr_container_max_ver}) @@ -220,8 +223,8 @@ BuildRequires: php-composer(mongodb/mongodb) >= %{mongodb_min_ver} BuildRequires: php-Monolog >= %{monolog_min_ver} BuildRequires: php-composer(nyholm/psr7) < %{nyholm_psr7_max_ver} BuildRequires: php-composer(nyholm/psr7) >= %{nyholm_psr7_min_ver} -BuildRequires: php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver} -BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} +BuildRequires: php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver} +BuildRequires: php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} BuildRequires: php-composer(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver} BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver} BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver} @@ -493,10 +496,10 @@ License: MIT # composer.json Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version} %if %{with_range_dependencies} -Requires:(php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} with php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver}) +Requires:(php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} with php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver}) %else -Requires: php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} -Requires: php-composer(ocramius/proxy-manager) < %{proxy_manager_max_ver} +Requires: php-composer(friendsofphp/proxy-manager-lts) >= %{proxy_manager_min_ver} +Requires: php-composer(friendsofphp/proxy-manager-lts) < %{proxy_manager_max_ver} %endif # phpcompatinfo for version 4.0.0-beta1 Requires: php-hash @@ -2482,6 +2485,7 @@ exit $RET %exclude %{symfony4_dir}/Bridge/PhpUnit/autoload-dev.php %exclude %{symfony4_dir}/Bridge/PhpUnit/composer.json %exclude %{symfony4_dir}/Bridge/PhpUnit/phpunit.* +%exclude %{symfony4_dir}/Bridge/PhpUnit/Tests # ------------------------------------------------------------------------------ @@ -2787,8 +2791,8 @@ exit $RET %exclude %{symfony4_dir}/Component/ErrorHandler/*.md %exclude %{symfony4_dir}/Component/ErrorHandler/autoload-dev.php %exclude %{symfony4_dir}/Component/ErrorHandler/composer.json -#exclude #{symfony4_dir}/Component/ErrorHandler/phpunit.* -#exclude #{symfony4_dir}/Component/ErrorHandler/Tests +%exclude %{symfony4_dir}/Component/ErrorHandler/phpunit.* +%exclude %{symfony4_dir}/Component/ErrorHandler/Tests # ------------------------------------------------------------------------------ @@ -2997,6 +3001,8 @@ exit $RET %exclude %{symfony4_dir}/Component/Mailer/composer.json %exclude %{symfony4_dir}/Component/Mailer/phpunit.* %exclude %{symfony4_dir}/Component/Mailer/Tests +%exclude %{symfony4_dir}/Component/Mailer/Bridge/*/phpunit.* +%exclude %{symfony4_dir}/Component/Mailer/Bridge/*/Tests # ------------------------------------------------------------------------------ @@ -3295,6 +3301,15 @@ exit $RET # ############################################################################## %changelog +* Thu Jan 28 2021 Remi Collet - 4.4.19-1 +- update to 4.4.19 +- drop dependency on ocramius/proxy-manager +- add dependency on friendsofphp/proxy-manager-lts +- raise dependency on doctrine_annotations_min_ver 1.10.4 +- raise dependency on doctrine/orm 2.6.3 +- raise dependency on twig/twig 1.43 +- sources from git snapshot + * Mon Dec 21 2020 Remi Collet - 4.4.18-1 - update to 4.4.18 -- cgit