summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-22 08:46:15 +0100
committerRemi Collet <remi@remirepo.net>2018-02-22 08:46:15 +0100
commitf7ff2d62d94b8a9b962af867c9e63101f72b7d9c (patch)
treedbfba0cdabae16b88f23e9537ff102b3ff0f66d1
parentb0b6c28d4ebf64a07f78024d5c5f5e4f403a5506 (diff)
v3.1.3 from Fedora + minor change for backport
-rw-r--r--.gitignore14
-rw-r--r--composer.json11
-rw-r--r--php-consolidation-output-formatters.spec42
3 files changed, 46 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 43cd2c8..6f69818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
-/php-consolidation-output-formatters-1.0.0-6428d8fb30c9ed3b96314580808b3e4415b46dd9.tar.gz
-/php-consolidation-output-formatters-2.0.1-8bce15438a97afba5dcf036a71d961977b64fa3e.tar.gz
-/php-consolidation-output-formatters-3.1.6-c8ea5734985cea4acd6343a2465a2f71cf011c82.tar.gz
-/php-consolidation-output-formatters-3.1.7-da39a0f14d5aaaee06732bb7cef2aea1de056b40.tar.gz
-/php-consolidation-output-formatters-3.1.8-0b50ba1134d581fd55376f3e21508dab009ced47.tar.gz
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.bz2
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index 6a6354e..adaba21 100644
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,12 @@
},
"require": {
"php": ">=5.4.0",
- "symfony/console": "^2.8|~3",
- "symfony/finder": "~2.5|~3.0"
+ "symfony/console": "^2.8|^3|^4",
+ "symfony/finder": "^2.5|^3|^4"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
- "satooshi/php-coveralls": "^1.0",
+ "satooshi/php-coveralls": "^1.0.2 | dev-master",
"squizlabs/php_codesniffer": "^2.7",
"victorjonsson/markdowndocs": "^1.3"
},
@@ -39,5 +39,10 @@
"branch-alias": {
"dev-master": "3.x-dev"
}
+ },
+ "config": {
+ "platform": {
+ "php": "5.6"
+ }
}
}
diff --git a/php-consolidation-output-formatters.spec b/php-consolidation-output-formatters.spec
index c29cb97..31ebb83 100644
--- a/php-consolidation-output-formatters.spec
+++ b/php-consolidation-output-formatters.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-consolidation-output-formatters
#
-# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2018 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,18 +12,22 @@
%global github_owner consolidation-org
%global github_name output-formatters
-%global github_version 3.1.11
-%global github_commit 3a1160440819269e6d8d9c11db67129384b8fb35
+%global github_version 3.1.13
+%global github_commit 3188461e965b32148c8fb85261833b2b72d34b8c
%global composer_vendor consolidation
%global composer_project output-formatters
# "php": ">=5.4.0"
%global php_min_ver 5.4.0
-# "symfony/console": "^2.8|~3"
-# "symfony/finder": "~2.5|~3.0"
+# "symfony/console": "^2.8|^3|^4"
+# "symfony/finder": "^2.5|^3|^4"
%global symfony_min_ver 2.8
+%if 0%{?fedora} >= 27
+%global symfony_max_ver 5.0
+%else
%global symfony_max_ver 4.0
+%endif
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -46,11 +50,14 @@ BuildArch: noarch
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 27
+BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+BuildRequires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+%else
BuildRequires: php-composer(symfony/console) < %{symfony_max_ver}
-BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver}
BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver}
-BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver}
-## phpcompatinfo (computed from version 3.1.11)
+%endif
+## phpcompatinfo (computed from version 3.1.13)
BuildRequires: php-dom
BuildRequires: php-json
BuildRequires: php-pcre
@@ -62,11 +69,14 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27
+Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver})
+Requires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver})
+%else
Requires: php-composer(symfony/console) < %{symfony_max_ver}
-Requires: php-composer(symfony/console) >= %{symfony_min_ver}
Requires: php-composer(symfony/finder) < %{symfony_max_ver}
-Requires: php-composer(symfony/finder) >= %{symfony_min_ver}
-# phpcompatinfo (computed from version 3.1.11)
+%endif
+# phpcompatinfo (computed from version 3.1.13)
Requires: php-dom
Requires: php-json
Requires: php-pcre
@@ -102,10 +112,12 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
[
+ '%{phpdir}/Symfony4/Component/Console/autoload.php',
'%{phpdir}/Symfony3/Component/Console/autoload.php',
'%{phpdir}/Symfony/Component/Console/autoload.php',
],
[
+ '%{phpdir}/Symfony4/Component/Finder/autoload.php',
'%{phpdir}/Symfony3/Component/Finder/autoload.php',
'%{phpdir}/Symfony/Component/Finder/autoload.php',
],
@@ -133,8 +145,8 @@ rm -f tests/testAPIDocs.php
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in php %{?rhel:php55} php56 php70 php71 php72; do
- if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
+for PHP_EXEC in "" php71 php72; do
+ if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
fi
@@ -155,6 +167,10 @@ exit $RETURN_CODE
%changelog
+* Wed Feb 21 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.13-1
+- Update to 3.1.13 (RHBZ #1505200)
+- Add range version dependencies for Fedora >= 27
+
* Wed Aug 30 2017 Shawn Iwinski <shawn@iwin.ski> - 3.1.11-1
- Update to 3.1.11 (RHBZ #1482728)