diff --git a/.gitignore b/.gitignore index 5ac7338..502ee0e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-guzzlehttp-psr7-1.3.0-31382fef2889136415751badebbd1cb022a4ed72.tar.gz /php-guzzlehttp-psr7-1.3.1-5c6447c9df362e8f8093bda8f5d8873fe5c7f65b.tar.gz /php-guzzlehttp-psr7-1.4.1-0d6c7ca039329247e4f0f8f8f6506810e8248855.tar.gz +/php-guzzlehttp-psr7-1.4.2-f5b8a8512e2b58b0071a7280e39f14f72e05d87c.tar.gz diff --git a/php-guzzlehttp-psr7.spec b/php-guzzlehttp-psr7.spec index ee024c2..24e005d 100644 --- a/php-guzzlehttp-psr7.spec +++ b/php-guzzlehttp-psr7.spec @@ -11,8 +11,8 @@ %global github_owner guzzle %global github_name psr7 -%global github_version 1.4.1 -%global github_commit 0d6c7ca039329247e4f0f8f8f6506810e8248855 +%global github_version 1.4.2 +%global github_commit f5b8a8512e2b58b0071a7280e39f14f72e05d87c %global composer_vendor guzzlehttp %global composer_project psr7 @@ -50,7 +50,7 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(psr/http-message) < %{psr_http_message_max_ver} BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} -## phpcompatinfo (computed from version 1.4.1) +## phpcompatinfo (computed from version 1.4.2) BuildRequires: php-hash BuildRequires: php-pcre BuildRequires: php-reflection @@ -64,7 +64,7 @@ BuildRequires: php-composer(fedora/autoloader) Requires: php(language) >= %{php_min_ver} Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver} Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} -# phpcompatinfo (computed from version 1.4.1) +# phpcompatinfo (computed from version 1.4.2) Requires: php-hash Requires: php-pcre Requires: php-spl @@ -95,9 +95,9 @@ cat <<'AUTOLOAD' | tee src/autoload.php require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('GuzzleHttp\\Psr7\\', __DIR__); +require_once __DIR__.'/functions_include.php'; \Fedora\Autoloader\Dependencies::required([ - __DIR__.'/functions_include.php', '%{phpdir}/Psr/Http/Message/autoload.php', ]); AUTOLOAD @@ -110,18 +110,16 @@ cp -rp src/* %{buildroot}%{phpdir}/GuzzleHttp/Psr7/ %check %if %{with_tests} -BOOTSTRAP=%{buildroot}%{phpdir}/GuzzleHttp/Psr7/autoload.php - : Upstream tests -%{_bindir}/phpunit --verbose --bootstrap $BOOTSTRAP - -: Upstream tests with SCLs if available -SCL_RETURN_CODE=0 -for SCL in %{?rhel:php55} php56 php70 php71; do - if which $SCL; then - $SCL %{_bindir}/phpunit --verbose --bootstrap $BOOTSTRAP || SCL_RETURN_CODE=1 +RETURN_CODE=0 +for PHP_EXEC in php %{?rhel:php55} php56 php70 php71; do + if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC %{_bindir}/phpunit --verbose \ + --bootstrap %{buildroot}%{phpdir}/GuzzleHttp/Psr7/autoload.php \ + || RETURN_CODE=1 fi done +exit $RETURN_CODE %else : Tests skipped %endif @@ -137,6 +135,10 @@ done %changelog +* Sat Apr 08 2017 Shawn Iwinski - 1.4.2-1 +- Updated to 1.4.2 (RHBZ #1434198) +- Don't use autoloader to load functions include + * Sat Mar 04 2017 Shawn Iwinski - 1.4.1-1 - Updated to 1.4.1 (RHBZ #1425429) - Switch autoloader to php-composer(fedora/autoloader) diff --git a/sources b/sources index 9f1db99..74d8387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-guzzlehttp-psr7-1.4.1-0d6c7ca039329247e4f0f8f8f6506810e8248855.tar.gz) = 90d60cb304285f36184a677724ed1197a2178ea1d1cdb9b6cf82b76b0df498ea973c72da555402c47dd5a44c5dec510e3eddb66662bbf7f0d85303025fa2b63e +SHA512 (php-guzzlehttp-psr7-1.4.2-f5b8a8512e2b58b0071a7280e39f14f72e05d87c.tar.gz) = 3d8a3d6548760195e299697d944820703f1ad8894b9c51d1b6692ac72d1f188995ac80bba491ddf3948b43cec4330049ff6a5a84de47572510723a9a46fc01cf