summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-08-12 16:49:36 +0200
committerRemi Collet <fedora@famillecollet.com>2015-08-12 16:49:36 +0200
commitcae180c2bfc2d5c298152d9c32cea3626e050c03 (patch)
tree1c7bf169d58a0f5406dcc631702ad113880ed1b6
parent42d6405d95346a6f4fb870de35fc6c41b125e759 (diff)
php-zendframework-zend-diactoros: sync with Fedora spec
-rw-r--r--php-zendframework-zend-diactoros.spec18
1 files changed, 14 insertions, 4 deletions
diff --git a/php-zendframework-zend-diactoros.spec b/php-zendframework-zend-diactoros.spec
index af40d9d..b8a70e3 100644
--- a/php-zendframework-zend-diactoros.spec
+++ b/php-zendframework-zend-diactoros.spec
@@ -51,9 +51,15 @@ BuildArch: noarch
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver}
-## phpcompatinfo (computed from version 1.1.2)
+## phpcompatinfo (computed from version 1.1.3)
+### NOTE: curl, gd, gmp, and shmop are all optional for
+### ZendTest\Diactoros\StreamTest::getResourceFor67()
+### (test/StreamTest.php) but the first one found wins
+### so only curl is chosen as a requirement here.
+BuildRequires: php-curl
BuildRequires: php-json
BuildRequires: php-pcre
+BuildRequires: php-reflection
BuildRequires: php-spl
## Autoloader
BuildRequires: php-composer(symfony/class-loader)
@@ -63,7 +69,7 @@ BuildRequires: php-composer(symfony/class-loader)
Requires: php(language) >= %{php_min_ver}
Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver}
Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver}
-# phpcompatinfo (computed from version 1.1.2)
+# phpcompatinfo (computed from version 1.1.3)
Requires: php-json
Requires: php-pcre
Requires: php-spl
@@ -97,8 +103,6 @@ cat <<'AUTOLOAD' | tee src/autoload.php
* @return \Symfony\Component\ClassLoader\ClassLoader
*/
-require_once '%{phpdir}/Psr/Http/Message/autoload.php';
-
if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
require_once '%{phpdir}/Symfony/Component/ClassLoader/ClassLoader.php';
@@ -110,6 +114,8 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
$fedoraClassLoader->addPrefix('Zend\\Diactoros\\', dirname(dirname(__DIR__)));
+require_once '%{phpdir}/Psr/Http/Message/autoload.php';
+
return $fedoraClassLoader;
AUTOLOAD
@@ -163,6 +169,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 11 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.1.3-1
+- Updated to 1.1.3 (RHBZ #1252195)
+- Updated autoloader to load dependencies after self registration
+
* Tue Aug 11 2015 Remi Collet <remi@remirepo.net> - 1.1.3-1
- update to 1.1.3