summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-07-03 09:36:02 +0200
committerRemi Collet <remi@remirepo.net>2018-07-03 09:36:02 +0200
commit7ebe126c8c04ccac7e8d20048a6ffe512b6597fb (patch)
treede3d9ab92c1fc13e18054b9582662c35e36137a1
parent5755be977a19f6761d1d06c59683aa3bfe3bf0ff (diff)
update to 4.3.1
use range dependencies on F27+
-rw-r--r--php-phpspec.spec52
1 files changed, 33 insertions, 19 deletions
diff --git a/php-phpspec.spec b/php-phpspec.spec
index e41bae7..55f5e2e 100644
--- a/php-phpspec.spec
+++ b/php-phpspec.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 0671a4c63377cad221d2202177853f070f718884
+%global gh_commit 4474f1cb4cf9873996fc07fac6533ab9298eb6fd
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpspec
%global gh_project phpspec
@@ -19,7 +19,7 @@
%global symfony_max 4
Name: php-phpspec
-Version: 4.3.0
+Version: 4.3.1
Release: 1%{?dist}
Summary: Specification-oriented BDD framework for PHP
@@ -35,19 +35,24 @@ Patch0: %{gh_project}-4-rpm.patch
BuildArch: noarch
BuildRequires: php(language) >= 7.0
-BuildRequires: php-composer(phpspec/prophecy) < 2
-BuildRequires: php-composer(phpspec/prophecy) >= 1.5
-BuildRequires: php-composer(phpspec/php-diff) < 2
-BuildRequires: php-composer(phpspec/php-diff) >= 1.0.0
-BuildRequires: php-composer(sebastian/exporter) < 4
-BuildRequires: php-composer(sebastian/exporter) >= 3
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(phpspec/prophecy) >= 1.5 with php-composer(phpspec/prophecy) < 2)
+BuildRequires: (php-composer(phpspec/php-diff) >= 1.0.0 with php-composer(phpspec/php-diff) < 2)
+BuildRequires: (php-composer(sebastian/exporter) >= 3 with php-composer(sebastian/exporter) < 4)
+BuildRequires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2)
+# remirepo:6
+%else
+BuildRequires: php-phpspec-prophecy >= 1.5
+BuildRequires: php-phpspec-php-diff >= 1.0.0
+BuildRequires: php-sebastian-exporter3 >= 3
+BuildRequires: php-doctrine-instantiator >= 1.0.5
+%endif
BuildRequires: php-symfony3-console >= %{symfony_min}
BuildRequires: php-symfony3-event-dispatcher >= %{symfony_min}
BuildRequires: php-symfony3-finder >= %{symfony_min}
BuildRequires: php-symfony3-process >= %{symfony_min}
BuildRequires: php-symfony3-yaml >= %{symfony_min}
-BuildRequires: php-composer(doctrine/instantiator) < 2
-BuildRequires: php-composer(doctrine/instantiator) >= 1.0.1
# From composer.json, require-dev
# "behat/behat": "^3.3",
# "symfony/filesystem": "^3.2 || ^4.0",
@@ -72,19 +77,24 @@ BuildRequires: php-composer(fedora/autoloader) >= 1
# "ext-tokenizer": "*"
Requires: php(language) >= 7.0
-Requires: php-composer(phpspec/prophecy) >= 1.5
-Requires: php-composer(phpspec/prophecy) < 2
-Requires: php-composer(phpspec/php-diff) >= 1.0.0
-Requires: php-composer(phpspec/php-diff) < 2
-Requires: php-composer(sebastian/exporter) < 4
-Requires: php-composer(sebastian/exporter) >= 3
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(phpspec/prophecy) >= 1.5 with php-composer(phpspec/prophecy) < 2)
+Requires: (php-composer(phpspec/php-diff) >= 1.0.0 with php-composer(phpspec/php-diff) < 2)
+Requires: (php-composer(sebastian/exporter) >= 3 with php-composer(sebastian/exporter) < 4)
+Requires: (php-composer(doctrine/instantiator) >= 1.0.5 with php-composer(doctrine/instantiator) < 2)
+# remirepo:6
+%else
+Requires: php-phpspec-prophecy >= 1.5
+Requires: php-phpspec-php-diff >= 1.0.0
+Requires: php-sebastian-exporter3 >= 3
+Requires: php-doctrine-instantiator >= 1.0.5
+%endif
Requires: php-symfony3-console >= %{symfony_min}
Requires: php-symfony3-event-dispatcher >= %{symfony_min}
Requires: php-symfony3-finder >= %{symfony_min}
Requires: php-symfony3-process >= %{symfony_min}
Requires: php-symfony3-yaml >= %{symfony_min}
-Requires: php-composer(doctrine/instantiator) >= 1.0.5
-Requires: php-composer(doctrine/instantiator) < 2
Requires: php-tokenizer
# Autoloader
Requires: php-composer(fedora/autoloader) >= 1
@@ -142,7 +152,7 @@ rm spec/PhpSpec/Message/CurrentExampleTrackerSpec.php
# Ignore this test which rely on composer installation
rm spec/PhpSpec/NamespaceProvider/ComposerPsrNamespaceProviderSpec.php
-for cmd in php php71 php72; do
+for cmd in php php71 php72 php73; do
if which $cmd; then
$cmd -d memory_limit=1G -d include_path=.:%{buildroot}%{_datadir}/php \
bin/phpspec \
@@ -165,6 +175,10 @@ done
%changelog
+* Tue Jul 3 2018 Remi Collet <remi@remirepo.net> - 4.3.1-1
+- update to 4.3.1
+- use range dependencies on F27+
+
* Sat Dec 23 2017 Remi Collet <remi@remirepo.net> - 4.3.0-1
- Update to 4.3.0