From 243966ba67caaeb492e4a372b1e60b9a62b955e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Nov 2019 09:28:58 +0100 Subject: - update to 3.4.31 - raise dependency on twig 1.41 - raise dependency on egulias/email-validator 2.1.10 - raise dependency on doctrine/annotations 1.7 * Sat Sep 14 2019 Shawn Iwinski - 3.4.30-2 - Update autoloader generator to include self PSR-0, PSR-4, files, and classmap --- php-symfony3.spec | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'php-symfony3.spec') diff --git a/php-symfony3.spec b/php-symfony3.spec index f88b8d6..100b42a 100644 --- a/php-symfony3.spec +++ b/php-symfony3.spec @@ -13,8 +13,8 @@ %global github_owner symfony %global github_name symfony -%global github_version 3.4.29 -%global github_commit 4c9b6d7d898457ae2189efdfaca58712269fc994 +%global github_version 3.4.31 +%global github_commit 944e04808117477f46f804133d17913b77cf63d3 %global composer_vendor symfony %global composer_project symfony @@ -25,7 +25,7 @@ # 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.0" +# "doctrine/annotations": "~1.7" # src/Symfony/Bundle/FrameworkBundle/composer.json # src/Symfony/Bundle/TwigBundle/composer.json # src/Symfony/Component/PropertyInfo/composer.json @@ -53,10 +53,9 @@ # "doctrine/orm": "~2.4,>=2.4.5" %global doctrine_orm_min_ver 2.4.5 %global doctrine_orm_max_ver 3.0 -# "egulias/email-validator": "~1.2,>=1.2.8|~2.0" -# NOTE: Min version not 3.0 to restrict to single major version -%global email_validator_min_ver 1.2.8 -%global email_validator_max_ver 2.0 +# "egulias/email-validator": "^2.1.10" +%global email_validator_min_ver 2.1.10 +%global email_validator_max_ver 3.0 # "fig/link-util": "^1.0" %global fig_link_util_min_ver 1.0 %global fig_link_util_max_ver 2.0 @@ -96,9 +95,9 @@ # NOTE: Min version not 4.0 to restrict to single major version %global symfony_security_acl_min_ver 2.8 %global symfony_security_acl_max_ver 3.0 -# "twig/twig": "^1.40|^2.9" +# "twig/twig": "^1.41|^2.10" # NOTE: Multiple major versions handled in autoloaders -%global twig_min_ver 1.40 +%global twig_min_ver 1.41 %global twig_max_ver 3.0 # Build using "--with tests" to enable tests @@ -113,7 +112,7 @@ Name: php-%{composer_project}3 Version: %{github_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Symfony PHP framework (version 3) # MIT and CC-BY-SA: @@ -203,7 +202,7 @@ BuildRequires: php-tokenizer BuildRequires: php-xml BuildRequires: php-xmlreader ## Autoloader -BuildRequires: php-composer(fedora/autoloader) +BuildRequires: php-fedora-autoloader-devel # Conflicts BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0 @@ -497,6 +496,7 @@ Summary: Symfony Framework Bundle (version 3) Requires: php-composer(%{composer_vendor}/cache) = %{version} Requires: php-composer(%{composer_vendor}/class-loader) = %{version} Requires: php-composer(%{composer_vendor}/config) = %{version} +Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/dependency-injection) = %{version} Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version} Requires: php-composer(%{composer_vendor}/filesystem) = %{version} @@ -583,6 +583,7 @@ Summary: Symfony Twig Bundle (version 3) # composer.json Requires: php-composer(%{composer_vendor}/config) = %{version} +Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/twig-bridge) = %{version} @@ -1865,10 +1866,6 @@ if (!defined('FEDORA_SYMFONY3_DIR')) { define('FEDORA_SYMFONY3_DIR', __DIR__); } -\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bridge\\', FEDORA_SYMFONY3_DIR.'/Bridge', true); -\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Bundle\\', FEDORA_SYMFONY3_DIR.'/Bundle', true); -\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\', FEDORA_SYMFONY3_DIR.'/Component', true); - \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/Composer/autoload.php', ]); @@ -2810,6 +2807,18 @@ exit $RET # ############################################################################## %changelog +* Tue Aug 27 2019 Remi Collet - 3.4.31-1 +- update to 3.4.31 +- raise dependency on twig 1.41 +- raise dependency on egulias/email-validator 2.1.10 +- raise dependency on doctrine/annotations 1.7 + +* Sat Sep 14 2019 Shawn Iwinski - 3.4.30-2 +- Update autoloader generator to include self PSR-0, PSR-4, files, and classmap + +* Tue Aug 20 2019 Remi Collet - 3.4.30-1 +- update to 3.4.30 + * Thu Jun 27 2019 Remi Collet - 3.4.29-1 - update to 3.4.29 -- cgit