diff options
| -rw-r--r-- | php-phpspec.spec | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/php-phpspec.spec b/php-phpspec.spec index a5ebf9e..5c97c3a 100644 --- a/php-phpspec.spec +++ b/php-phpspec.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 4f42719d8d7a26063b9aa79a0f83ed56c79618f4 +%global gh_commit 8e72ed3576f6e26baebb2c214a8dba344508e3bd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpspec %global gh_project phpspec @@ -16,16 +16,14 @@ # to ensure components consistency %if 0%{?fedora} > 26 %global symfony_ns Symfony3 -%global symfony_min 3.0 -%global symfony_max 4 +%global symfony_rpm php-symfony3 %else %global symfony_ns Symfony -%global symfony_min 2.7 -%global symfony_max 3 +%global symfony_rpm php-symfony %endif Name: php-phpspec -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Summary: Specification-oriented BDD framework for PHP @@ -44,25 +42,18 @@ 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(symfony/console) < %{symfony_max} -BuildRequires: php-composer(symfony/console) >= %{symfony_min} -BuildRequires: php-composer(symfony/event-dispatcher) < %{symfony_max} -BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min} -BuildRequires: php-composer(symfony/finder) < %{symfony_max} -BuildRequires: php-composer(symfony/finder) >= %{symfony_min} -BuildRequires: php-composer(symfony/process) < %{symfony_max} -BuildRequires: php-composer(symfony/process) >= %{symfony_min} -BuildRequires: php-composer(symfony/yaml) < %{symfony_max} -BuildRequires: php-composer(symfony/yaml) >= %{symfony_min} +BuildRequires: %{symfony_rpm}-console +BuildRequires: %{symfony_rpm}-event-dispatcher +BuildRequires: %{symfony_rpm}-finder +BuildRequires: %{symfony_rpm}-process +BuildRequires: %{symfony_rpm}-yaml 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.0", # "phpunit/phpunit": "^5.5|^6.0", # "ciaranmcnulty/versionbasedtestskipper": "^0.2.1" -BuildRequires: php-composer(symfony/filesystem) < %{symfony_max} -BuildRequires: php-composer(symfony/filesystem) >= %{symfony_min} +BuildRequires: %{symfony_rpm}-filesystem %if 0%{?fedora} >= 26 BuildRequires: php-composer(sebastian/exporter) < 4 %global phpunit %{_bindir}/phpunit6 @@ -97,16 +88,11 @@ Requires: php-composer(sebastian/exporter) < 4 %else Requires: php-composer(sebastian/exporter) < 3 %endif -Requires: php-composer(symfony/console) < %{symfony_max} -Requires: php-composer(symfony/console) >= %{symfony_min} -Requires: php-composer(symfony/event-dispatcher) < %{symfony_max} -Requires: php-composer(symfony/event-dispatcher) >= %{symfony_min} -Requires: php-composer(symfony/finder) < %{symfony_max} -Requires: php-composer(symfony/finder) >= %{symfony_min} -Requires: php-composer(symfony/process) < %{symfony_max} -Requires: php-composer(symfony/process) >= %{symfony_min} -Requires: php-composer(symfony/yaml) < %{symfony_max} -Requires: php-composer(symfony/yaml) >= %{symfony_min} +Requires: %{symfony_rpm}-console +Requires: %{symfony_rpm}-symfony/event-dispatcher +Requires: %{symfony_rpm}-symfony/finder +Requires: %{symfony_rpm}-symfony/process +Requires: %{symfony_rpm}-symfony/yaml Requires: php-composer(doctrine/instantiator) >= 1.0.1 Requires: php-composer(doctrine/instantiator) < 2 Requires: php-tokenizer @@ -165,16 +151,14 @@ rm spec/PhpSpec/Message/CurrentExampleTrackerSpec.php # Ignore this test which rely on composer installation rm spec/PhpSpec/NamespaceProvider/ComposerPsrNamespaceProviderSpec.php -# PHP 7.2: https://github.com/phpspec/phpspec/issues/1094 - -for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit6"; do +for cmd in "php %{phpunit}" php70 php71 php72; do if which $cmd; then set $cmd - $1 -d include_path=.:%{buildroot}%{_datadir}/php \ + $1 -d memory_limit=1G -d include_path=.:%{buildroot}%{_datadir}/php \ bin/phpspec \ run --format pretty --verbose --no-ansi - $1 $2 \ + $1 ${2:-%{_bindir}/phpunit6} \ --verbose \ --bootstrap %{buildroot}%{_datadir}/php/PhpSpec/autoload.php fi @@ -191,6 +175,10 @@ done %changelog +* Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 3.4.3-1 +- Update to 3.4.3 +- switch to symfony package name + * Mon Aug 7 2017 Remi Collet <remi@remirepo.net> - 3.4.2-1 - Update to 3.4.2 |