Fedora: switch to symfony4 only, see #1657328

1 files changed, 16 insertions, 23 deletions

diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 7b29888..63e06b5 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -29,7 +29,7 @@
 
 Name:           php-bartlett-PHP-Reflect
 Version:        4.3.0
-%global specrel 1
+%global specrel 2
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
 
@@ -53,29 +53,19 @@ BuildRequires:  %{phpunit}
 BuildRequires: (php-composer(sebastian/version)                 >= 1.0   with php-composer(sebastian/version)                 < 3)
 BuildRequires: (php-composer(nikic/php-parser)                  >= 3.1   with php-composer(nikic/php-parser)                  < 4)
 BuildRequires: (php-composer(doctrine/collections)              >= 1.4   with php-composer(doctrine/collections)              < 2)
-BuildRequires: (php-composer(symfony/event-dispatcher)          >= 2.5   with php-composer(symfony/event-dispatcher)          < 5)
-BuildRequires: (php-composer(symfony/finder)                    >= 2.5   with php-composer(symfony/finder)                    < 5)
-BuildRequires: (php-composer(symfony/console)                   >= 2.5   with php-composer(symfony/console)                   < 5)
-BuildRequires: (php-composer(symfony/stopwatch)                 >= 2.5   with php-composer(symfony/stopwatch)                 < 5)
-BuildRequires: (php-composer(symfony/dependency-injection)      >= 2.5   with php-composer(symfony/dependency-injection)      < 5)
 BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 3.0   with php-composer(phpdocumentor/reflection-docblock) < 4)
 BuildRequires: (php-composer(seld/jsonlint)                     >= 1.1   with php-composer(seld/jsonlint)                     < 2)
 BuildRequires: (php-composer(justinrainbow/json-schema)         >= 1.3   with php-composer(justinrainbow/json-schema)         < 2)
 BuildRequires: (php-composer(monolog/monolog)                   >= 1.10  with php-composer(monolog/monolog)                   < 2)
 BuildRequires: (php-composer(psr/log)                           >= 1.0   with php-composer(psr/log)                           < 2)
 BuildRequires: (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    <  2)
-# remirepo:24
+# remirepo:19
 %else
 BuildRequires:  php-composer(sebastian/version)                 >= 1.0
 BuildRequires:  php-composer(sebastian/version)                 <  3
 BuildRequires:  php-nikic-php-parser3                           >= 3.1
 BuildRequires:  php-composer(doctrine/collections)              >= 1.4
 BuildRequires:  php-composer(doctrine/collections)              <  2
-BuildRequires:  %{sym_prefix}-event-dispatcher
-BuildRequires:  %{sym_prefix}-finder
-BuildRequires:  %{sym_prefix}-console
-BuildRequires:  %{sym_prefix}-stopwatch
-BuildRequires:  %{sym_prefix}-dependency-injection
 BuildRequires:  php-composer(phpdocumentor/reflection-docblock) >= 3.0
 BuildRequires:  php-composer(phpdocumentor/reflection-docblock) <  4
 BuildRequires:  php-composer(seld/jsonlint)                     >= 1.1
@@ -89,6 +79,11 @@ BuildRequires:  php-composer(psr/log)                           <  2
 BuildRequires:  php-composer(doctrine/cache)           >= 1.3
 BuildRequires:  php-composer(doctrine/cache)           <  2
 %endif
+BuildRequires:  %{sym_prefix}-event-dispatcher
+BuildRequires:  %{sym_prefix}-finder
+BuildRequires:  %{sym_prefix}-console
+BuildRequires:  %{sym_prefix}-stopwatch
+BuildRequires:  %{sym_prefix}-dependency-injection
 # For our autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -127,29 +122,19 @@ Requires:       php-tokenizer
 Requires:      (php-composer(sebastian/version)                 >= 1.0   with php-composer(sebastian/version)                 < 3)
 Requires:      (php-composer(nikic/php-parser)                  >= 3.1   with php-composer(nikic/php-parser)                  < 4)
 Requires:      (php-composer(doctrine/collections)              >= 1.4   with php-composer(doctrine/collections)              < 2)
-Requires:      (php-composer(symfony/event-dispatcher)          >= 2.5   with php-composer(symfony/event-dispatcher)          < 5)
-Requires:      (php-composer(symfony/finder)                    >= 2.5   with php-composer(symfony/finder)                    < 5)
-Requires:      (php-composer(symfony/console)                   >= 2.5   with php-composer(symfony/console)                   < 5)
-Requires:      (php-composer(symfony/stopwatch)                 >= 2.5   with php-composer(symfony/stopwatch)                 < 5)
-Requires:      (php-composer(symfony/dependency-injection)      >= 2.5   with php-composer(symfony/dependency-injection)      < 5)
 Requires:      (php-composer(phpdocumentor/reflection-docblock) >= 3.0   with php-composer(phpdocumentor/reflection-docblock) < 4)
 Requires:      (php-composer(seld/jsonlint)                     >= 1.1   with php-composer(seld/jsonlint)                     < 2)
 Requires:      (php-composer(justinrainbow/json-schema)         >= 1.3   with php-composer(justinrainbow/json-schema)         < 2)
 Requires:      (php-composer(psr/log)                           >= 1.0   with php-composer(psr/log)                           < 2)
 # Mandatory for our patch
 Requires:      (php-composer(doctrine/cache)                    >= 1.3   with php-composer(doctrine/cache)                    <  2)
-# remirepo:23
+# remirepo:18
 %else
 Requires:       php-composer(sebastian/version)                 >= 1.0
 Requires:       php-composer(sebastian/version)                 <  3
 Requires:       php-nikic-php-parser3                           >= 3.1
 Requires:       php-composer(doctrine/collections)              >= 1.4
 Requires:       php-composer(doctrine/collections)              <  2
-Requires:       %{sym_prefix}-event-dispatcher
-Requires:       %{sym_prefix}-finder
-Requires:       %{sym_prefix}-console
-Requires:       %{sym_prefix}-stopwatch
-Requires:       %{sym_prefix}-dependency-injection
 Requires:       php-composer(phpdocumentor/reflection-docblock) >= 3.0
 Requires:       php-composer(phpdocumentor/reflection-docblock) <  4
 Requires:       php-composer(seld/jsonlint)                     >= 1.1
@@ -162,6 +147,11 @@ Requires:       php-composer(psr/log)                           <  2
 Requires:       php-composer(doctrine/cache)           >= 1.3
 Requires:       php-composer(doctrine/cache)           <  2
 %endif
+Requires:       %{sym_prefix}-event-dispatcher
+Requires:       %{sym_prefix}-finder
+Requires:       %{sym_prefix}-console
+Requires:       %{sym_prefix}-stopwatch
+Requires:       %{sym_prefix}-dependency-injection
 #    "require-dev": {
 #        "monolog/monolog": "~1.10",
 #    "suggest": {
@@ -250,6 +240,9 @@ fi
 
 
 %changelog
+* Sun Dec  9 2018 Remi Collet <remi@remirepo.net> - 4.3.0-2
+- Fedora: switch to symfony4 only, see #1657328
+
 * Mon Nov 26 2018 Remi Collet <remi@remirepo.net> - 4.3.0-1
 - update to 4.3.0
 - use range dependencies