summaryrefslogtreecommitdiffstats
path: root/php-guzzlehttp-psr7.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-08-22 10:38:16 +0200
committerRemi Collet <fedora@famillecollet.com>2015-08-22 10:38:16 +0200
commit60adae5423bed46163232d4db6fc545b3a49eaa4 (patch)
tree612cb9e9fe23e9b19e6e2794dd5ef6194beb8e6e /php-guzzlehttp-psr7.spec
parentff30adf6692657cc2ec4decebc9a0774a32a189f (diff)
php-guzzlehttp-psr7: 1.2.0, backport from Fedora
Diffstat (limited to 'php-guzzlehttp-psr7.spec')
-rw-r--r--php-guzzlehttp-psr7.spec22
1 files changed, 12 insertions, 10 deletions
diff --git a/php-guzzlehttp-psr7.spec b/php-guzzlehttp-psr7.spec
index 3fc83ff..9e79332 100644
--- a/php-guzzlehttp-psr7.spec
+++ b/php-guzzlehttp-psr7.spec
@@ -12,8 +12,8 @@
%global github_owner guzzle
%global github_name psr7
-%global github_version 1.1.0
-%global github_commit af0e1758de355eb113917ad79c3c0e3604bce4bd
+%global github_version 1.2.0
+%global github_commit 4ef919b0cf3b1989523138b60163bbcb7ba1ff7e
%global composer_vendor guzzlehttp
%global composer_project psr7
@@ -31,7 +31,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 3%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: PSR-7 message implementation
Group: Development/Libraries
@@ -47,7 +47,7 @@ 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.0)
+## phpcompatinfo (computed from version 1.2.0)
BuildRequires: php-hash
BuildRequires: php-pcre
BuildRequires: php-spl
@@ -60,7 +60,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.0)
+# phpcompatinfo (computed from version 1.2.0)
Requires: php-hash
Requires: php-pcre
Requires: php-spl
@@ -80,7 +80,7 @@ functionality like query string parsing.
%setup -qn %{github_name}-%{github_commit}
: Create autoloader
-(cat <<'AUTOLOAD'
+cat <<'AUTOLOAD' | tee src/autoload.php
<?php
/**
* Autoloader for %{name} and its' dependencies
@@ -90,8 +90,6 @@ functionality like query string parsing.
* @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';
@@ -103,11 +101,11 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
$fedoraClassLoader->addPrefix('GuzzleHttp\\Psr7\\', dirname(dirname(__DIR__)));
-require_once __DIR__ . '/functions.php';
+require_once __DIR__ . '/functions_include.php';
+require_once '%{phpdir}/Psr/Http/Message/autoload.php';
return $fedoraClassLoader;
AUTOLOAD
-) | tee src/autoload.php
%build
@@ -147,6 +145,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Aug 16 2015 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.2.0-1
+- Updated to 1.2.0 (RHBZ #1253997)
+- Updated autoloader to load dependencies after self registration
+
* Mon Jul 20 2015 Remi Collet <remi@remirepo.net> - 1.1.0-3
- add EL-5 stuff, backport for #remirepo