From 2817bbc0ce17ae0d0c92fb462e92881a1fd243c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 09:58:19 +0100 Subject: raise dependency on PHP 7.0 drop dependency on symfony/polyfill-php* --- php-symfony.spec | 63 +++++++------------------------------------------------- 1 file changed, 7 insertions(+), 56 deletions(-) diff --git a/php-symfony.spec b/php-symfony.spec index f608aa4..a008329 100644 --- a/php-symfony.spec +++ b/php-symfony.spec @@ -21,7 +21,8 @@ %global composer_project symfony # "php": ">=5.3.9" -%global php_min_ver 5.3.9 +# to avoid symfony-polyfill +%global php_min_ver 7.0 # "doctrine/annotations": "~1.0" # src/Symfony/Bundle/FrameworkBundle/composer.json # src/Symfony/Component/PropertyInfo/composer.json @@ -105,7 +106,7 @@ Name: php-%{composer_project} Version: %{github_version} -Release: 2%{?dist} +Release: 5%{?dist} Summary: PHP framework for web projects License: MIT @@ -131,10 +132,6 @@ BuildRequires: (php-composer(ocramius/proxy-manager) >= %{proxy_manager_min_ver} BuildRequires: (php-composer(phpdocumentor/reflection) >= %{phpdocumentor_reflection_min_ver} with php-composer(phpdocumentor/reflection) < %{phpdocumentor_reflection_max_ver}) BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) BuildRequires: (php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_min_ver} with php-composer(swiftmailer/swiftmailer) < %{swiftmailer_max_ver}) -BuildRequires: (php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver}) -BuildRequires: (php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver}) -BuildRequires: (php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver}) -BuildRequires: (php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver}) BuildRequires: (php-composer(symfony/polyfill-util) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-util) < %{symfony_polyfill_max_ver}) BuildRequires: (php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} with php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver}) BuildRequires: (php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver}) @@ -165,14 +162,6 @@ BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} BuildRequires: php-composer(swiftmailer/swiftmailer) < %{swiftmailer_max_ver} BuildRequires: php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_min_ver} -BuildRequires: php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver} -BuildRequires: php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} -BuildRequires: php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver} -BuildRequires: php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} -BuildRequires: php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver} -BuildRequires: php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} -BuildRequires: php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver} -BuildRequires: php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} BuildRequires: php-composer(symfony/polyfill-util) < %{symfony_polyfill_max_ver} BuildRequires: php-composer(symfony/polyfill-util) >= %{symfony_polyfill_min_ver} BuildRequires: php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver} @@ -616,11 +605,8 @@ Summary: Symfony Security Bundle Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/security) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver}) Requires: (php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} with php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver}) %else -Requires: php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} Requires: php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver} Requires: php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} %endif @@ -1151,15 +1137,6 @@ URL: http://symfony.com/doc/2.8/components/http_foundation/index.html Requires: %{name}-common = %{version}-%{release} # composer.json -%if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver}) -Requires: (php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver}) -%else -Requires: php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} -Requires: php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} -%endif # phpcompatinfo (computed from version 2.8.6) Requires: php-date Requires: php-fileinfo @@ -1212,11 +1189,8 @@ Requires: php-composer(%{composer_vendor}/debug) = %{version} Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version} Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver}) Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) %else -Requires: php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} -Requires: php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/log) < %{psr_log_max_ver} %endif @@ -1275,12 +1249,6 @@ URL: http://symfony.com/doc/2.8/components/intl.html Requires: %{name}-common = %{version}-%{release} #composer.json -%if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver}) -%else -Requires: php-composer(symfony/polyfill-php54) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php54) >= %{symfony_polyfill_min_ver} -%endif # composer.json: optional Requires: php-intl # phpcompatinfo (computed from version 2.8.6) @@ -1317,12 +1285,6 @@ Summary: Symfony LDAP Component Requires: %{name}-common = %{version}-%{release} # composer.json -%if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver}) -%else -Requires: php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} -Requires: php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver} -%endif Requires: php-ldap # phpcompatinfo (computed from version 2.8.6) Requires: php-spl @@ -1514,18 +1476,9 @@ Requires: php-composer(%{composer_vendor}/http-foundation) = %{version} Requires: php-composer(%{composer_vendor}/http-kernel) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} %if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver}) -Requires: (php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver}) -Requires: (php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver}) Requires: (php-composer(symfony/polyfill-util) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-util) < %{symfony_polyfill_max_ver}) Requires: (php-composer(symfony/security-acl) >= %{symfony_security_acl_min_ver} with php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver}) %else -Requires: php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} -Requires: php-composer(symfony/polyfill-php56) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php56) >= %{symfony_polyfill_min_ver} -Requires: php-composer(symfony/polyfill-php70) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php70) >= %{symfony_polyfill_min_ver} Requires: php-composer(symfony/polyfill-util) < %{symfony_polyfill_max_ver} Requires: php-composer(symfony/polyfill-util) >= %{symfony_polyfill_min_ver} Requires: php-composer(symfony/security-acl) < %{symfony_security_acl_max_ver} @@ -1585,12 +1538,6 @@ Summary: Symfony Serializer Component URL: http://symfony.com/doc/2.8/components/serializer.html # composer.json -%if %{with_range_dependencies} -Requires: (php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} with php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver}) -%else -Requires: php-composer(symfony/polyfill-php55) < %{symfony_polyfill_max_ver} -Requires: php-composer(symfony/polyfill-php55) >= %{symfony_polyfill_min_ver} -%endif # composer.json: optional Requires: php-composer(%{composer_vendor}/config) = %{version} Requires: php-composer(%{composer_vendor}/property-access) = %{version} @@ -2708,6 +2655,10 @@ done # ############################################################################## %changelog +* Mon Oct 26 2020 Remi Collet - 2.8.52-5 +- raise dependency on PHP 7.0 +- drop dependency on symfony/polyfill-php* + * Mon Dec 2 2019 Remi Collet - 2.8.52-2 - allow symfony/security-acl v3 -- cgit