sync with Fedora

1 files changed, 150 insertions, 26 deletions

diff --git a/php-symfony.spec b/php-symfony.spec
index e6cdc9c..b55d4d5 100644
--- a/php-symfony.spec
+++ b/php-symfony.spec
@@ -68,7 +68,7 @@
 %global phpdocumentor_reflection_max_ver 2.0
 # "psr/log": "~1.0"
 #     NOTE: Min version not 1.0 because autoloader required
-%global psr_log_min_ver 1.0.0-8
+%global psr_log_min_ver 1.0.1
 %global psr_log_max_ver 2.0
 # "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev"
 #     src/Symfony/Bridge/Swiftmailer/composer.json
@@ -91,13 +91,13 @@
 %global twig_min_ver 1.34
 %global twig_max_ver 3.0
 
-%if 0%{?fedora} < 21 && 0%{?rhel} < 7
 # Build using "--with tests" to enable tests
-# Disabled by default with old PHPUnit version
 %global with_tests   0%{?_with_tests:1}
+
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global with_range_dependencies 1
 %else
-# Build using "--without tests" to disable tests
-%global with_tests   0%{!?_without_tests:1}
+%global with_range_dependencies 0
 %endif
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
@@ -107,7 +107,7 @@
 
 Name:          php-%{composer_project}
 Version:       %{github_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       PHP framework for web projects
 
 License:       MIT
@@ -115,12 +115,32 @@ URL:           https://symfony.com
 Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_short}.tar.gz
 
 BuildArch:     noarch
-# Tests
-%if %{with_tests}
 ## composer.json
 # Force version to 4.8 for autoloader
 BuildRequires: php-composer(phpunit/phpunit)          >= 4.8
 BuildRequires: php(language)                          >= %{php_min_ver}
+%if %{with_range_dependencies}
+BuildRequires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
+BuildRequires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
+BuildRequires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+BuildRequires: (php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver} with php-composer(doctrine/data-fixtures) < %{doctrine_datafixtures_max_ver})
+BuildRequires: (php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} with php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver})
+BuildRequires: (php-composer(doctrine/doctrine-bundle) >= %{doctrine_bundle_min_ver} with php-composer(doctrine/doctrine-bundle) < %{doctrine_bundle_max_ver})
+BuildRequires: (php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver})
+BuildRequires: (php-composer(egulias/email-validator) >= %{email_validator_min_ver} with php-composer(egulias/email-validator) < %{email_validator_max_ver})
+BuildRequires: (php-composer(monolog/monolog) >= %{monolog_min_ver} with php-composer(monolog/monolog) < %{monolog_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(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})
+%else
 BuildRequires: php-composer(doctrine/annotations)     <  %{doctrine_annotations_max_ver}
 BuildRequires: php-composer(doctrine/annotations)     >= %{doctrine_annotations_min_ver}
 BuildRequires: php-composer(doctrine/cache)           <  %{doctrine_cache_max_ver}
@@ -159,10 +179,14 @@ BuildRequires: php-composer(symfony/polyfill-util)    <  %{symfony_polyfill_max_
 BuildRequires: php-composer(symfony/polyfill-util)    >= %{symfony_polyfill_min_ver}
 BuildRequires: php-composer(symfony/security-acl)     <  %{symfony_security_acl_max_ver}
 BuildRequires: php-composer(symfony/security-acl)     >= %{symfony_security_acl_min_ver}
-# Notice Symfony\Bridge\Twig\Tests\Node\TransNodeTest::testCompileStrict fails with v2
-# Legacy deprecation notices (13)
+### See twig-bridge
+%if 0%{?fedora} < 25 && 0%{?rhel} < 8
 BuildRequires: php-composer(twig/twig)                <  2
+%else
+BuildRequires: php-composer(twig/twig)                <  %{twig_max_ver}
+%endif
 BuildRequires: php-composer(twig/twig)                >= %{twig_min_ver}
+%endif
 ## phpcompatinfo (computed from version 2.8.6)
 BuildRequires: php-ctype
 BuildRequires: php-curl
@@ -191,7 +215,6 @@ BuildRequires: php-spl
 BuildRequires: php-sqlite3
 BuildRequires: php-tokenizer
 BuildRequires: php-xml
-%endif
 
 # Bridges
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge)      = %{version}
@@ -270,18 +293,28 @@ Obsoletes: php-channel-symfony2
 Summary:  Symfony Doctrine Bridge
 
 # composer.json
+%if %{with_range_dependencies}
+Requires: (php-composer(doctrine/common) >= %{doctrine_common_min_ver} with php-composer(doctrine/common) < %{doctrine_common_max_ver})
+%else
 Requires: php-composer(doctrine/common)                  <  %{doctrine_common_max_ver}
 Requires: php-composer(doctrine/common)                  >= %{doctrine_common_min_ver}
+%endif
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/form)          =  %{version}
 Requires: php-composer(%{composer_vendor}/property-info) =  %{version}
 Requires: php-composer(%{composer_vendor}/validator)     =  %{version}
+%if %{with_range_dependencies}
+Requires: (php-composer(doctrine/data-fixtures) >= %{doctrine_datafixtures_min_ver} with php-composer(doctrine/data-fixtures) < %{doctrine_datafixtures_max_ver})
+Requires: (php-composer(doctrine/dbal) >= %{doctrine_dbal_min_ver} with php-composer(doctrine/dbal) < %{doctrine_dbal_max_ver})
+Requires: (php-composer(doctrine/orm) >= %{doctrine_orm_min_ver} with php-composer(doctrine/orm) < %{doctrine_orm_max_ver})
+%else
 Requires: php-composer(doctrine/data-fixtures)           <  %{doctrine_datafixtures_max_ver}
 Requires: php-composer(doctrine/data-fixtures)           >= %{doctrine_datafixtures_min_ver}
 Requires: php-composer(doctrine/dbal)                    <  %{doctrine_dbal_max_ver}
 Requires: php-composer(doctrine/dbal)                    >= %{doctrine_dbal_min_ver}
 Requires: php-composer(doctrine/orm)                     <  %{doctrine_orm_max_ver}
 Requires: php-composer(doctrine/orm)                     >= %{doctrine_orm_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires: php-ctype
 Requires: php-date
@@ -315,8 +348,12 @@ http://symfony.com/doc/2.8/reference/configuration/doctrine.html
 Summary:  Symfony Monolog Bridge
 
 # composer.json
+%if %{with_range_dependencies}
+Requires: (php-composer(monolog/monolog) >= %{monolog_min_ver} with php-composer(monolog/monolog) < %{monolog_max_ver})
+%else
 Requires: php-composer(monolog/monolog) <  %{monolog_max_ver}
 Requires: php-composer(monolog/monolog) >= %{monolog_min_ver}
+%endif
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/console)          = %{version}
 Requires: php-composer(%{composer_vendor}/event-dispatcher) = %{version}
@@ -377,8 +414,12 @@ Summary:  Symfony ProxyManager Bridge
 
 # 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})
+%else
 Requires: php-composer(ocramius/proxy-manager)                  <  %{proxy_manager_max_ver}
 Requires: php-composer(ocramius/proxy-manager)                  >= %{proxy_manager_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires: php-reflection
 Requires: php-spl
@@ -398,8 +439,12 @@ Provides integration for ProxyManager [1] with various Symfony components.
 Summary:  Symfony Swiftmailer Bridge
 
 # composer.json
+%if %{with_range_dependencies}
+Requires: (php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_min_ver} with php-composer(swiftmailer/swiftmailer) < %{swiftmailer_max_ver})
+%else
 Requires: php-composer(swiftmailer/swiftmailer) <  %{swiftmailer_max_ver}
 Requires: php-composer(swiftmailer/swiftmailer) >= %{swiftmailer_min_ver}
+%endif
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/http-kernel) = %{version}
 # phpcompatinfo (computed from version 2.8.6)
@@ -425,12 +470,16 @@ instead.
 Summary:  Symfony Twig Bridge
 
 # composer.json
+%if %{with_range_dependencies}
+Requires: (php-composer(twig/twig) >= %{twig_min_ver} with php-composer(twig/twig) < %{twig_max_ver})
+%else
 %if 0%{?fedora} < 25 && 0%{?rhel} < 8
 Requires: php-composer(twig/twig)                              <  2
 %else
 Requires: php-composer(twig/twig)                              <  %{twig_max_ver}
 %endif
 Requires: php-composer(twig/twig)                              >= %{twig_min_ver}
+%endif
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/asset)               =  %{version}
 Requires: php-composer(%{composer_vendor}/expression-language) =  %{version}
@@ -513,10 +562,15 @@ Requires: php-composer(%{composer_vendor}/security-csrf)        =  %{version}
 Requires: php-composer(%{composer_vendor}/stopwatch)            =  %{version}
 Requires: php-composer(%{composer_vendor}/templating)           =  %{version}
 Requires: php-composer(%{composer_vendor}/translation)          =  %{version}
+%if %{with_range_dependencies}
+Requires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
+Requires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
+%else
 Requires: php-composer(doctrine/annotations)                    <  %{doctrine_annotations_max_ver}
 Requires: php-composer(doctrine/annotations)                    >= %{doctrine_annotations_min_ver}
 Requires: php-composer(doctrine/cache)                          <  %{doctrine_cache_max_ver}
 Requires: php-composer(doctrine/cache)                          >= %{doctrine_cache_min_ver}
+%endif
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/console)              =  %{version}
 Requires: php-composer(%{composer_vendor}/form)                 =  %{version}
@@ -563,10 +617,15 @@ Summary:  Symfony Security Bundle
 # composer.json
 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
 # phpcompatinfo (computed from version 2.8.6)
 Requires: php-pcre
 Requires: php-spl
@@ -777,9 +836,12 @@ URL:       http://symfony.com/doc/2.8/components/console/index.html
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/event-dispatcher) =  %{version}
 Requires:  php-composer(%{composer_vendor}/process)          =  %{version}
-#Requires:  php-composer(psr/log)                             >= %%{psr_log_min_ver}
-Requires:  php-PsrLog                                        >= %{psr_log_min_ver}
+%if %{with_range_dependencies}
+Requires:  (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
+Requires:  php-composer(psr/log)                             >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log)                             <  %{psr_log_max_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-date
 Requires:  php-dom
@@ -840,9 +902,12 @@ URL:      http://symfony.com/doc/2.8/components/debug/index.html
 
 Requires:  %{name}-common = %{version}-%{release}
 # composer.json
-#Requires:  php-composer(psr/log) >= %%{psr_log_min_ver}
-Requires:  php-PsrLog            >= %{psr_log_min_ver}
+%if %{with_range_dependencies}
+Requires:  (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
+Requires:  php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log) <  %{psr_log_max_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires: php-pcre
 Requires: php-reflection
@@ -1042,10 +1107,10 @@ Summary:   Symfony Form Component
 URL:       http://symfony.com/doc/2.8/components/form/index.html
 
 # composer.json
-Requires:  php-composer(%{composer_vendor}/event-dispatcher) =  %{version}
-Requires:  php-composer(%{composer_vendor}/intl)             =  %{version}
-Requires:  php-composer(%{composer_vendor}/options-resolver) =  %{version}
-Requires:  php-composer(%{composer_vendor}/property-access)  =  %{version}
+Requires:  php-composer(%{composer_vendor}/event-dispatcher) = %{version}
+Requires:  php-composer(%{composer_vendor}/intl)             = %{version}
+Requires:  php-composer(%{composer_vendor}/options-resolver) = %{version}
+Requires:  php-composer(%{composer_vendor}/property-access)  = %{version}
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/security-csrf)    = %{version}
 Requires:  php-composer(%{composer_vendor}/validator)        = %{version}
@@ -1088,10 +1153,15 @@ 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
@@ -1143,9 +1213,12 @@ URL:       http://symfony.com/doc/2.8/components/http_kernel/index.html
 Requires:  php-composer(%{composer_vendor}/debug)                =  %{version}
 Requires:  php-composer(%{composer_vendor}/event-dispatcher)     =  %{version}
 Requires:  php-composer(%{composer_vendor}/http-foundation)      =  %{version}
-#Requires:  php-composer(psr/log)                                 >= %%{psr_log_min_ver}
-Requires:  php-PsrLog                                            >= %{psr_log_min_ver}
+%if %{with_range_dependencies}
+Requires:  (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
+Requires:  php-composer(psr/log)                                 >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log)                                 <  %{psr_log_max_ver}
+%endif
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/browser-kit)          =  %{version}
 Requires:  php-composer(%{composer_vendor}/class-loader)         =  %{version}
@@ -1201,8 +1274,12 @@ 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)
@@ -1239,8 +1316,12 @@ 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
@@ -1365,8 +1446,12 @@ Summary:  Symfony Property Info Component
 # composer.json: optional
 Requires: php-composer(%{composer_vendor}/doctrine-bridge) =  %{version}
 Requires: php-composer(%{composer_vendor}/serializer)      =  %{version}
+%if %{with_range_dependencies}
+Requires: (php-composer(phpdocumentor/reflection) >= %{phpdocumentor_reflection_min_ver} with php-composer(phpdocumentor/reflection) < %{phpdocumentor_reflection_max_ver})
+%else
 Requires: php-composer(phpdocumentor/reflection)           <  %{phpdocumentor_reflection_max_ver}
 Requires: php-composer(phpdocumentor/reflection)           >= %{phpdocumentor_reflection_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires: php-pcre
 Requires: php-reflection
@@ -1392,8 +1477,12 @@ Requires:  php-composer(%{composer_vendor}/dependency-injection) =  %{version}
 Requires:  php-composer(%{composer_vendor}/expression-language)  =  %{version}
 Requires:  php-composer(%{composer_vendor}/http-foundation)      =  %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)                 =  %{version}
+%if %{with_range_dependencies}
+Requires:  (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
+%else
 Requires:  php-composer(doctrine/annotations)                    <  %{doctrine_annotations_max_ver}
 Requires:  php-composer(doctrine/annotations)                    >= %{doctrine_annotations_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-pcre
 Requires:  php-reflection
@@ -1423,6 +1512,13 @@ Requires:  php-composer(%{composer_vendor}/event-dispatcher)    =  %{version}
 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}
@@ -1433,6 +1529,7 @@ Requires:  php-composer(symfony/polyfill-util)                  <  %{symfony_pol
 Requires:  php-composer(symfony/polyfill-util)                  >= %{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
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/expression-language) =  %{version}
 Requires:  php-composer(%{composer_vendor}/form)                =  %{version}
@@ -1487,16 +1584,25 @@ 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}
 Requires:  php-composer(%{composer_vendor}/yaml)            =  %{version}
+%if %{with_range_dependencies}
+Requires:  (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
+Requires:  (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
+%else
 Requires:  php-composer(doctrine/annotations)               <  %{doctrine_annotations_max_ver}
 Requires:  php-composer(doctrine/annotations)               >= %{doctrine_annotations_min_ver}
 Requires:  php-composer(doctrine/cache)                     <  %{doctrine_cache_max_ver}
 Requires:  php-composer(doctrine/cache)                     >= %{doctrine_cache_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-ctype
 Requires:  php-dom
@@ -1547,9 +1653,12 @@ URL:       http://symfony.com/doc/2.8/components/templating/index.html
 
 Requires:  %{name}-common        =  %{version}-%{release}
 # composer.json: optional
-#Requires:  php-composer(psr/log) >= %%{psr_log_min_ver}
-Requires:  php-PsrLog            >= %{psr_log_min_ver}
+%if %{with_range_dependencies}
+Requires:  (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
+Requires:  php-composer(psr/log) >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log) <  %{psr_log_max_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-ctype
 Requires:  php-hash
@@ -1583,9 +1692,12 @@ URL:       http://symfony.com/doc/2.8/components/translation/index.html
 # composer.json: optional
 Requires:  php-composer(%{composer_vendor}/config) =  %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)   =  %{version}
-#Requires:  php-composer(psr/log)                   >= %%{psr_log_min_ver}
-Requires:  php-PsrLog                              >= %{psr_log_min_ver}
+%if %{with_range_dependencies}
+Requires:  (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
+%else
+Requires:  php-composer(psr/log)                   >= %{psr_log_min_ver}
 Requires:  php-composer(psr/log)                   <  %{psr_log_max_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-dom
 Requires:  php-intl
@@ -1623,12 +1735,18 @@ Requires:  php-composer(%{composer_vendor}/http-foundation)     =  %{version}
 Requires:  php-composer(%{composer_vendor}/intl)                =  %{version}
 Requires:  php-composer(%{composer_vendor}/property-access)     =  %{version}
 Requires:  php-composer(%{composer_vendor}/yaml)                =  %{version}
+%if %{with_range_dependencies}
+Requires:  (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
+Requires:  (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver})
+Requires:  (php-composer(egulias/email-validator) >= %{email_validator_min_ver} with php-composer(egulias/email-validator) < %{email_validator_max_ver})
+%else
 Requires:  php-composer(doctrine/annotations)                   <  %{doctrine_annotations_max_ver}
 Requires:  php-composer(doctrine/annotations)                   >= %{doctrine_annotations_min_ver}
 Requires:  php-composer(doctrine/cache)                         <  %{doctrine_cache_max_ver}
 Requires:  php-composer(doctrine/cache)                         >= %{doctrine_cache_min_ver}
 Requires:  php-composer(egulias/email-validator)                <  %{email_validator_max_ver}
 Requires:  php-composer(egulias/email-validator)                >= %{email_validator_min_ver}
+%endif
 # phpcompatinfo (computed from version 2.8.6)
 Requires:  php-ctype
 Requires:  php-date
@@ -1737,7 +1855,7 @@ The YAML Component loads and dumps YAML files.
 %setup -qn %{github_name}-%{github_commit}
 
 : Remove unnecessary files
-find src -name '.git*' -delete
+find src -name '.git*' -delete -print
 
 : Remove unwanted components
 rm -r src/Symfony/Bridge/Propel1
@@ -2589,6 +2707,12 @@ done
 # ##############################################################################
 
 %changelog
+* Wed Jun 19 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.8.51-2
+- Disable tests by default (follows php-symfony3 and php-symfony4 pkgs)
+- Always require build dependencies
+- Use range version dependencies for Fedora >= 27 || RHEL >= 8
+- Bump psr/log min version to 1.0.1 so php-composer(psr/log) virtual provide can be used
+
 * Thu Apr 18 2019 Remi Collet <remi@remirepo.net> - 2.8.51-1
 - update to 2.8.51