diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-03-03 14:59:51 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-03-03 14:59:51 +0100 |
| commit | 8634961179fd52ab1b09cc454cdccab70cc08047 (patch) | |
| tree | 1d6d6494418e8ffe7a06537a9a20c6b22dce4f4e | |
| parent | fc7e95106730e27d97b471a39453e54dda99afde (diff) | |
php-phpspec: fix autoloader
| -rw-r--r-- | php-phpspec.spec | 6 | ||||
| -rw-r--r-- | phpspec-autoload.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/php-phpspec.spec b/php-phpspec.spec index 7688ae6..ce60515 100644 --- a/php-phpspec.spec +++ b/php-phpspec.spec @@ -14,7 +14,7 @@ Name: php-phpspec Version: 3.2.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Specification-oriented BDD framework for PHP Group: Development/Libraries @@ -31,6 +31,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-composer(phpspec/prophecy) >= 1.4 BuildRequires: php-composer(phpspec/php-diff) >= 1.0.0 +BuildRequires: php-composer(sebastian/exporter) < 3 BuildRequires: php-composer(sebastian/exporter) >= 1.0 BuildRequires: php-composer(symfony/console) >= 2.3.0 BuildRequires: php-composer(symfony/event-dispatcher) >= 2.1 @@ -187,6 +188,9 @@ rm -rf %{buildroot} %changelog +* Fri Mar 3 2017 Remi Collet <remi@remirepo.net> - 3.2.3-3 +- fix autoloader for dep. with multiple versions + * Sun Jan 29 2017 Remi Collet <remi@fedoraproject.org> - 3.2.3-1 - update to 3.2.3 diff --git a/phpspec-autoload.php b/phpspec-autoload.php index 4ab6dde..8124ff4 100644 --- a/phpspec-autoload.php +++ b/phpspec-autoload.php @@ -14,6 +14,6 @@ if (is_dir(getcwd().'/spec')) { // Dependencies (Rely on include_path as in PHPUnit dependencies + circular dependencies) require_once 'phpspec/php-diff/autoload.php'; -require_once 'Prophecy/autoload.php'; require_once 'SebastianBergmann/Exporter/autoload.php'; +require_once 'Prophecy/autoload.php'; // After exporter to avoid newer version require_once 'Doctrine/Instantiator/autoload.php'; |