diff options
| author | Remi Collet <remi@remirepo.net> | 2019-10-02 14:18:02 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-10-02 14:18:02 +0200 |
| commit | edc780d93257c213b834ef773d8d4a3c0d7fdd9b (patch) | |
| tree | e565d52f7b5f308853a67cd2c9b0d24b12cb116d | |
| parent | 79007103f51a1a22a735891ffef4c01e0c07fff3 (diff) | |
- update to 6.0.0
- raise dependency to PHP 7.2
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-phpspec.spec | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/composer.json b/composer.json index 83e12ba..f786366 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ ], "require": { - "php": "^7.1, <7.4", + "php": "^7.2, <7.4", "phpspec/prophecy": "^1.7", "phpspec/php-diff": "^1.0.0", "sebastian/exporter": "^1.0 || ^2.0 || ^3.0", @@ -45,6 +45,10 @@ "phpspec/nyan-formatters": "Adds Nyan formatters" }, + "conflict": { + "sebastian/comparator" : "<1.2.4" + }, + "autoload": { "psr-0": { "PhpSpec": "src/" @@ -61,7 +65,7 @@ "extra": { "branch-alias": { - "dev-master": "5.1.x-dev" + "dev-master": "6.0.x-dev" } } diff --git a/php-phpspec.spec b/php-phpspec.spec index a8ccc85..fcaab4c 100644 --- a/php-phpspec.spec +++ b/php-phpspec.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ff4119650a76de25eb674530547f1924082d3703 +%global gh_commit d78e90427386063729afe989f9038da0c3212dff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project phpspec @@ -24,7 +24,7 @@ %global symfony_max 5 Name: php-phpspec -Version: 5.1.2 +Version: 6.0.0 Release: 1%{?dist} Summary: Specification-oriented BDD framework for PHP @@ -38,7 +38,7 @@ Source1: %{gh_project}-autoload.php Patch0: %{gh_project}-4-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2) @@ -67,7 +67,7 @@ BuildRequires: phpunit6 BuildRequires: php-composer(fedora/autoloader) >= 1 # From composer.json, require -# "php": "^7.0,<7.4", +# "php": "^7.2, <7.4", # "phpspec/prophecy": "^1.7", # "phpspec/php-diff": "^1.0.0", # "sebastian/exporter": "^1.0 || ^2.0 || ^3.0", @@ -79,7 +79,7 @@ BuildRequires: php-composer(fedora/autoloader) >= 1 # "doctrine/instantiator": "^1.0.5" # "ext-tokenizer": "*" -Requires: php(language) >= 7.1 +Requires: php(language) >= 7.2 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2) @@ -184,6 +184,10 @@ done %changelog +* Wed Oct 2 2019 Remi Collet <remi@remirepo.net> - 6.0.0-1 +- update to 6.0.0 +- raise dependency to PHP 7.2 + * Wed Oct 2 2019 Remi Collet <remi@remirepo.net> - 5.1.2-1 - update to 5.1.2 |