Updated to 1.4.2 (RHBZ #1434198)

- Don't use autoloader to load functions include

(cherry picked from commit a6b9f1c919efab3e594b3b317daa2952da34413f)

2 files changed, 22 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..502ee0e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/php-guzzlehttp-psr7-1.1.0-af0e1758de355eb113917ad79c3c0e3604bce4bd.tar.gz
+/php-guzzlehttp-psr7-1.2.0-4ef919b0cf3b1989523138b60163bbcb7ba1ff7e.tar.gz
+/php-guzzlehttp-psr7-1.2.1-4d0bdbe1206df7440219ce14c972aa57cc5e4982.tar.gz
+/php-guzzlehttp-psr7-1.2.3-2e89629ff057ebb49492ba08e6995d3a6a80021b.tar.gz
+/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 0889721..660c05a 100644
--- a/php-guzzlehttp-psr7.spec
+++ b/php-guzzlehttp-psr7.spec
@@ -43,7 +43,6 @@ URL:           https://github.com/%{github_owner}/%{github_name}
 Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 Source1:       %{name}-get-source.sh
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 # Tests
 %if %{with_tests}
@@ -52,7 +51,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
@@ -66,7 +65,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
@@ -97,46 +96,37 @@ 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
 
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p %{buildroot}%{phpdir}/GuzzleHttp/Psr7
 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
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -146,6 +136,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 08 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.4.2-1
+- Updated to 1.4.2 (RHBZ #1434198)
+- Don't use autoloader to load functions include
+
 * Wed Mar 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-1
 - Update to 1.4.2