From 128f54ea5491121d03bb65b3fa9b55e1e414808c Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 29 Nov 2015 09:24:49 +0100
Subject: php-phpspec: 2.4.0
---
php-phpspec.spec | 53 +++++++++++++++++++++++++++++++++++++---------------
phpspec-autoload.php | 3 ++-
2 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/php-phpspec.spec b/php-phpspec.spec
index bc1889d..8ec5674 100644
--- a/php-phpspec.spec
+++ b/php-phpspec.spec
@@ -6,14 +6,14 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 36635a903bdeb54899d7407bc95610501fd98559
+%global gh_commit 1d3938e6d9ffb1bd4805ea8ddac62ea48767f358
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phpspec
%global gh_project phpspec
#global prever beta3
Name: php-phpspec
-Version: 2.3.0
+Version: 2.4.0
Release: 1%{?dist}
Summary: Specification-oriented BDD framework for PHP
@@ -29,7 +29,6 @@ Patch0: %{gh_project}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: %{_bindir}/phpunit
BuildRequires: php-composer(phpspec/prophecy) >= 1.4
BuildRequires: php-composer(phpspec/php-diff) >= 1.0.0
BuildRequires: php-composer(sebastian/exporter) >= 1.0
@@ -40,7 +39,12 @@ BuildRequires: php-composer(symfony/process) >= 2.6
BuildRequires: php-composer(symfony/yaml) >= 2.1
BuildRequires: php-composer(doctrine/instantiator) >= 1.0.1
# From composer.json, require-dev
+# "behat/behat": "^3.0.11",
+# "bossa/phpspec2-expect": "~1.0",
+# "symfony/filesystem": "~2.1|~3.0",
+# "phpunit/phpunit": "~4.4"
BuildRequires: php-composer(symfony/filesystem) >= 2.1
+BuildRequires: php-composer(phpunit/phpunit) >= 4.4
# For our autoloader
BuildRequires: php-composer(symfony/class-loader)
@@ -49,12 +53,14 @@ BuildRequires: php-composer(symfony/class-loader)
# "phpspec/prophecy": "~1.4",
# "phpspec/php-diff": "~1.0.0",
# "sebastian/exporter": "~1.0",
-# "symfony/console": "~2.3",
-# "symfony/event-dispatcher": "~2.1",
-# "symfony/process": "^2.6",
-# "symfony/finder": "~2.1",
-# "symfony/yaml": "~2.1",
+# "symfony/console": "~2.3|~3.0",
+# "symfony/event-dispatcher": "~2.1|~3.0",
+# "symfony/process": "^2.6|~3.0",
+# "symfony/finder": "~2.1|~3.0",
+# "symfony/yaml": "~2.1|~3.0",
# "doctrine/instantiator": "^1.0.1"
+# "ext-tokenizer": "*"
+
Requires: php(language) >= 5.3.3
Requires: php-composer(phpspec/prophecy) >= 1.4
Requires: php-composer(phpspec/prophecy) < 2
@@ -63,17 +69,18 @@ Requires: php-composer(phpspec/php-diff) < 2
Requires: php-composer(sebastian/exporter) >= 1.0
Requires: php-composer(sebastian/exporter) < 2
Requires: php-composer(symfony/console) >= 2.3.0
-Requires: php-composer(symfony/console) < 3
+Requires: php-composer(symfony/console) < 4
Requires: php-composer(symfony/event-dispatcher) >= 2.1
-Requires: php-composer(symfony/event-dispatcher) < 3
+Requires: php-composer(symfony/event-dispatcher) < 4
Requires: php-composer(symfony/finder) >= 2.1
-Requires: php-composer(symfony/finder) < 3
+Requires: php-composer(symfony/finder) < 4
Requires: php-composer(symfony/process) >= 2.6
-Requires: php-composer(symfony/process) < 3
+Requires: php-composer(symfony/process) < 4
Requires: php-composer(symfony/yaml) >= 2.1
-Requires: php-composer(symfony/yaml) < 3
+Requires: php-composer(symfony/yaml) < 4
Requires: php-composer(doctrine/instantiator) >= 1.0.1
Requires: php-composer(doctrine/instantiator) < 2
+Requires: php-tokenizer
# For our autoloader
Requires: php-composer(symfony/class-loader)
# From phpcompatinfo report
@@ -81,7 +88,6 @@ Requires: php-pcntl
Requires: php-pcre
Requires: php-reflection
Requires: php-spl
-Requires: php-tokenizer
# Composer
Provides: php-composer(phpspec/phpspec) = %{version}
@@ -125,15 +131,28 @@ install -Dpm755 bin/phpspec %{buildroot}%{_bindir}/phpspec
%check
export LANG=en_GB.utf8
+# Ignore this test which use bossa/phpspec2-expect
+rm spec/PhpSpec/Message/CurrentExampleTrackerSpec.php
+
%{_bindir}/php \
-d include_path=.:%{buildroot}%{_datadir}/php \
bin/phpspec \
- run --format pretty --verbose --no-ansi
+ run --format pretty --verbose --no-ansi
%{_bindir}/phpunit \
--verbose \
--bootstrap %{buildroot}%{_datadir}/php/PhpSpec/autoload.php
+if which php70; then
+ php70 \
+ -d include_path=.:%{buildroot}%{_datadir}/php \
+ bin/phpspec \
+ run --format pretty --verbose --no-ansi
+
+ php70 %{_bindir}/phpunit \
+ --verbose \
+ --bootstrap %{buildroot}%{_datadir}/php/PhpSpec/autoload.php
+fi
%clean
rm -rf %{buildroot}
@@ -150,6 +169,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Nov 29 2015 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
+- update to 2.4.0
+- allow to use symfony 3.0
+
* Wed Oct 28 2015 Remi Collet <remi@fedoraproject.org> - 2.3.0-1
- update to 2.3.0
diff --git a/phpspec-autoload.php b/phpspec-autoload.php
index 1fb529a..d39e8d1 100644
--- a/phpspec-autoload.php
+++ b/phpspec-autoload.php
@@ -1,7 +1,8 @@
<?php
/* Autoloader for phpspec/phpspec and its dependencies */
-$vendorDir = '/usr/share/php';
+$vendorDir = stream_resolve_include_path('Symfony/Component/ClassLoader/ClassLoader.php');
+$vendorDir = dirname(dirname(dirname(dirname($vendorDir))));
// Use Symfony autoloader
if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
--
cgit