summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-11-07 13:49:27 +0100
committerRemi Collet <remi@remirepo.net>2017-11-07 13:49:27 +0100
commita8764795f79a2af56868cae59ee35b59edb79b44 (patch)
tree32896ec0c60c238ecf8d3d062f29c33a577291ae
parentd3d680ee10dad0dff503aae5bc926494f5e75c7d (diff)
fix FTBFS from Koschei using symfony package names
-rw-r--r--php-cs-fixer.spec54
1 files changed, 21 insertions, 33 deletions
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 1b69e2c..53edcd6 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -22,7 +22,7 @@
Name: php-cs-fixer
Version: 2.8.0
-Release: 2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
+Release: 3%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
Group: Development/Tools
@@ -57,24 +57,17 @@ BuildRequires: php-composer(doctrine/annotations) < 2
BuildRequires: php-composer(doctrine/annotations) >= 1.2
BuildRequires: php-composer(gecko-packages/gecko-php-unit) < %{gecko_max}
BuildRequires: php-composer(gecko-packages/gecko-php-unit) >= %{gecko_min}
-BuildRequires: php-composer(symfony/console) < 4
-BuildRequires: php-composer(symfony/console) >= 3.0
-BuildRequires: php-composer(symfony/event-dispatcher) < 4
-BuildRequires: php-composer(symfony/event-dispatcher) >= 3.0
-BuildRequires: php-composer(symfony/filesystem) < 4
-BuildRequires: php-composer(symfony/filesystem) >= 3.0
-BuildRequires: php-composer(symfony/finder) < 4
-BuildRequires: php-composer(symfony/finder) >= 3.0
-BuildRequires: php-composer(symfony/options-resolver) < 4
-BuildRequires: php-composer(symfony/options-resolver) >= 3.0
+BuildRequires: php-symfony3-console
+BuildRequires: php-symfony3-event-dispatcher
+BuildRequires: php-symfony3-filesystem
+BuildRequires: php-symfony3-finder
+BuildRequires: php-symfony3-options-resolver
BuildRequires: php-composer(symfony/polyfill-php70) < 2
BuildRequires: php-composer(symfony/polyfill-php70) >= 1.0
BuildRequires: php-composer(symfony/polyfill-php72) < 2
BuildRequires: php-composer(symfony/polyfill-php72) >= 1.4
-BuildRequires: php-composer(symfony/process) < 4
-BuildRequires: php-composer(symfony/process) >= 3.0
-BuildRequires: php-composer(symfony/stopwatch) < 4
-BuildRequires: php-composer(symfony/stopwatch) >= 3.0
+BuildRequires: php-symfony3-process
+BuildRequires: php-symfony3-stopwatch
BuildRequires: php-composer(sebastian/diff) < 2
BuildRequires: php-composer(sebastian/diff) >= 1.4
BuildRequires: php-mbstring
@@ -87,8 +80,8 @@ BuildRequires: php-phar
BuildRequires: php-spl
BuildRequires: php-xml
# Missing dependency for Console
-BuildRequires: php-composer(symfony/debug) < 4
-BuildRequires: php-composer(symfony/debug) >= 3.2
+BuildRequires: php-symfony3-debug
+BuildRequires: php-symfony3-debug
# From composer.json, "require-dev": {
# NOTICE: listener disabled during test suite
# "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
@@ -138,27 +131,19 @@ Requires: php-composer(gecko-packages/gecko-php-unit) < %{gecko_max}
Requires: php-composer(gecko-packages/gecko-php-unit) >= %{gecko_min}
Requires: php-composer(sebastian/diff) < 2
Requires: php-composer(sebastian/diff) >= 1.4
-Requires: php-composer(symfony/console) < 4
-Requires: php-composer(symfony/console) >= 3.2
-Requires: php-composer(symfony/event-dispatcher) < 4
-Requires: php-composer(symfony/event-dispatcher) >= 3.0
-Requires: php-composer(symfony/filesystem) < 4
-Requires: php-composer(symfony/filesystem) >= 3.0
-Requires: php-composer(symfony/finder) < 4
-Requires: php-composer(symfony/finder) >= 3.0
-Requires: php-composer(symfony/options-resolver) < 4
-Requires: php-composer(symfony/options-resolver) >= 3.0
+Requires: php-symfony3-console
+Requires: php-symfony3-event-dispatcher
+Requires: php-symfony3-filesystem
+Requires: php-symfony3-finder
+Requires: php-symfony3-options-resolver
Requires: php-composer(symfony/polyfill-php70) < 2
Requires: php-composer(symfony/polyfill-php70) >= 1.0
Requires: php-composer(symfony/polyfill-php72) < 2
Requires: php-composer(symfony/polyfill-php72) >= 1.4
-Requires: php-composer(symfony/process) < 4
-Requires: php-composer(symfony/process) >= 3.0
-Requires: php-composer(symfony/stopwatch) < 4
-Requires: php-composer(symfony/stopwatch) >= 3.0
+Requires: php-symfony3-process
+Requires: php-symfony3-stopwatch
# Missing dependency for Console
-Requires: php-composer(symfony/debug) < 4
-Requires: php-composer(symfony/debug) >= 3.0
+Requires: php-symfony3-debug
# From composer.json, "suggest": {
# "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
# "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -306,6 +291,9 @@ exit $ret
%changelog
+* Tue Nov 7 2017 Remi Collet <remi@remirepo.net> - 2.8.0-3
+- fix FTBFS from Koschei using symfony package names
+
* Fri Nov 3 2017 Remi Collet <remi@remirepo.net> - 2.8.0-2
- use phpunit6 and php-gecko-packages-gecko-php-unit3 on F26+