summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-14 14:29:56 +0200
committerRemi Collet <remi@remirepo.net>2018-05-14 14:29:56 +0200
commit1e6e73d42a7367f03b4f78a50f7e5c9d74e96564 (patch)
tree3f00e190f98ee7bf7c6e2e140c5da7ccc6da26cc
parent4a2f98795418c8a5d2dc453112cabb5ec548aa0e (diff)
Version 3.4.1 from Fedora:
* Sun May 13 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.1-1 - Update to 3.4.1 (RHBZ #1574020)
-rw-r--r--composer.json19
-rw-r--r--php-league-climate.spec36
2 files changed, 39 insertions, 16 deletions
diff --git a/composer.json b/composer.json
index 24fbfbc..3f45539 100644
--- a/composer.json
+++ b/composer.json
@@ -9,16 +9,25 @@
"email": "hey@joe.codes",
"homepage": "http://joe.codes/",
"role": "Developer"
+ }, {
+ "name": "Craig Duncan",
+ "email": "git@duncanc.co.uk",
+ "homepage": "https://github.com/duncan3dc",
+ "role": "Developer"
}
],
"require": {
- "php": ">=5.4.0",
- "seld/cli-prompt": "~1.0"
+ "psr/log": "^1.0",
+ "php": "^5.6|^7.0",
+ "seld/cli-prompt": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.6",
- "mockery/mockery": "~0.9",
- "mikey179/vfsStream": "~1.4"
+ "phpunit/phpunit": "^5.7.16",
+ "mockery/mockery": "^1.0",
+ "mikey179/vfsStream": "^1.4"
+ },
+ "suggest": {
+ "ext-mbstring": "If ext-mbstring is not available you MUST install symfony/polyfill-mbstring"
},
"autoload": {
"psr-4": {
diff --git a/php-league-climate.spec b/php-league-climate.spec
index 42e84cb..b58fa70 100644
--- a/php-league-climate.spec
+++ b/php-league-climate.spec
@@ -12,23 +12,27 @@
%global github_owner thephpleague
%global github_name climate
-%global github_version 3.2.4
-%global github_commit ca70f67f7739cca823eba0ad98f8130bca226bf0
+%global github_version 3.4.1
+%global github_commit d657a19837c1f79a891381fb128b755aa3386381
%global composer_vendor league
%global composer_project climate
-# "php": ">=5.4.0"
-%global php_min_ver 5.4.0
-# "mikey179/vfsStream": "~1.4"
+# "php": "^5.6|^7.0"
+%global php_min_ver 5.6.0
+# "mikey179/vfsStream": "^1.4"
# NOTE: Min version not 1.4 because autoloader required
%global vfsstream_min_ver 1.6.0
%global vfsstream_max_ver 2.0
-# "mockery/mockery": "~0.9"
-# NOTE: Min version not 0.9 because autoloader required
+# "mockery/mockery": "^1.0"
+# NOTE: Min version not 1.0 because tests pass with 0.9 version available
+# in Fedora and version 1.0 is not available in Fedora
%global mockery_min_ver 0.9.3
-%global mockery_max_ver 1.0
-# "seld/cli-prompt": "~1.0"
+%global mockery_max_ver 2.0
+# "psr/log": "^1.0"
+%global psr_log_min_ver 1.0
+%global psr_log_max_ver 2.0
+# "seld/cli-prompt": "^1.0"
%global seld_cli_prompt_min_ver 1.0
%global seld_cli_prompt_max_ver 2.0
@@ -60,12 +64,15 @@ BuildRequires: php-composer(phpunit/phpunit)
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(mikey179/vfsStream) >= %{vfsstream_min_ver} with php-composer(mikey179/vfsStream) < %{vfsstream_max_ver})
BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver})
+BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
BuildRequires: (php-composer(seld/cli-prompt) >= %{seld_cli_prompt_min_ver} with php-composer(seld/cli-prompt) < %{seld_cli_prompt_max_ver})
%else
BuildRequires: php-composer(mikey179/vfsStream) < %{vfsstream_max_ver}
BuildRequires: php-composer(mikey179/vfsStream) >= %{vfsstream_min_ver}
BuildRequires: php-composer(mockery/mockery) < %{mockery_max_ver}
BuildRequires: php-composer(mockery/mockery) >= %{mockery_min_ver}
+BuildRequires: php-composer(psr/log) < %{psr_log_max_ver}
+BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver}
BuildRequires: php-composer(seld/cli-prompt) < %{seld_cli_prompt_max_ver}
BuildRequires: php-composer(seld/cli-prompt) >= %{seld_cli_prompt_min_ver}
%endif
@@ -83,10 +90,13 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
Requires: (php-composer(seld/cli-prompt) >= %{seld_cli_prompt_min_ver} with php-composer(seld/cli-prompt) < %{seld_cli_prompt_max_ver})
%else
-Requires: php-composer(seld/cli-prompt) >= %{seld_cli_prompt_min_ver}
+Requires: php-composer(psr/log) < %{psr_log_max_ver}
+Requires: php-composer(psr/log) >= %{psr_log_min_ver}
Requires: php-composer(seld/cli-prompt) < %{seld_cli_prompt_max_ver}
+Requires: php-composer(seld/cli-prompt) >= %{seld_cli_prompt_min_ver}
%endif
# phpcompatinfo (computed from version 3.2.1)
Requires: php-json
@@ -128,6 +138,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('League\\CLImate\\', __DIR__);
\Fedora\Autoloader\Dependencies::required(array(
+ '%{phpdir}/Psr/Log/autoload.php',
'%{phpdir}/Seld/CliPrompt/autoload.php',
));
AUTOLOAD
@@ -159,7 +170,7 @@ sed '/require.*vendor\/mikey179/d' -i tests/FileTest.php
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71; do
+for PHP_EXEC in "" php70 php71 php72; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
@@ -182,6 +193,9 @@ exit $RETURN_CODE
%changelog
+* Sun May 13 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.1-1
+- Update to 3.4.1 (RHBZ #1574020)
+
* Mon Apr 23 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.2.4-1
- Update to 3.2.4 (RHBZ #1549561)
- Update get source script to save source in same directory