sync with fedora

1 files changed, 39 insertions, 20 deletions

diff --git a/php-aws-sdk3.spec b/php-aws-sdk3.spec
index 5e7b4bf..be89dea 100644
--- a/php-aws-sdk3.spec
+++ b/php-aws-sdk3.spec
@@ -56,7 +56,7 @@
 
 Name:          php-aws-sdk3
 Version:       %{github_version}
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Amazon Web Services framework for PHP
 
 Group:         Development/Libraries
@@ -68,13 +68,25 @@ URL:           http://aws.amazon.com/sdkforphp
 Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 Source1:       %{name}-get-source.sh
 
+# Fix for PHP 7.2
+# https://github.com/aws/aws-sdk-php/pull/1298
+# https://github.com/aws/aws-sdk-php/pull/1298.patch
+Patch0:        %{name}-upstream-pull-request-1298.patch
+
 BuildArch:     noarch
 # Library version value and autoloader check
-BuildRequires: php-cli                              >= %{php_min_ver}
-BuildRequires: php-composer(guzzlehttp/guzzle)      >= 6
-BuildRequires: php-composer(guzzlehttp/promises)    >= %{guzzle_promises_min_ver}
-BuildRequires: php-composer(guzzlehttp/psr7)        >= %{guzzle_psr7_min_ver}
+BuildRequires: php-cli
+## composer.json
+BuildRequires: php(language) >= %{php_min_ver}
+BuildRequires: php-composer(guzzlehttp/guzzle) <  %{guzzle_max_ver}
+BuildRequires: php-composer(guzzlehttp/guzzle) >= 6
+BuildRequires: php-composer(guzzlehttp/promises) <  %{guzzle_promises_max_ver}
+BuildRequires: php-composer(guzzlehttp/promises) >= %{guzzle_promises_min_ver}
+BuildRequires: php-composer(guzzlehttp/psr7) <  %{guzzle_psr7_max_ver}
+BuildRequires: php-composer(guzzlehttp/psr7) >= %{guzzle_psr7_min_ver}
+BuildRequires: php-composer(mtdowling/jmespath.php) <  %{jmespath_max_ver}
 BuildRequires: php-composer(mtdowling/jmespath.php) >= %{jmespath_min_ver}
+## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
 # Tests
 %if %{with_tests}
@@ -85,13 +97,13 @@ BuildRequires: php-composer(andrewsville/php-token-reflection) <  %{tokenreflect
 BuildRequires: php-composer(andrewsville/php-token-reflection) >= %{tokenreflection_min_ver}
 BuildRequires: php-composer(aws/aws-php-sns-message-validator) <  %{aws_sns_message_validator_max_ver}
 BuildRequires: php-composer(aws/aws-php-sns-message-validator) >= %{aws_sns_message_validator_min_ver}
-BuildRequires: php-composer(doctrine/cache)                    <  %{doctrine_cache_max_ver}
-BuildRequires: php-composer(doctrine/cache)                    >= %{doctrine_cache_min_ver}
-BuildRequires: php-composer(nette/neon)                        <  %{nette_neon_max_ver}
-BuildRequires: php-composer(nette/neon)                        >= %{nette_neon_min_ver}
+BuildRequires: php-composer(doctrine/cache) <  %{doctrine_cache_max_ver}
+BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
+BuildRequires: php-composer(nette/neon) <  %{nette_neon_max_ver}
+BuildRequires: php-composer(nette/neon) >= %{nette_neon_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(psr/cache)                         <  %{psr_cache_max_ver}
-BuildRequires: php-composer(psr/cache)                         >= %{psr_cache_min_ver}
+BuildRequires: php-composer(psr/cache) <  %{psr_cache_max_ver}
+BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
 BuildRequires: php-dom
 BuildRequires: php-json
 BuildRequires: php-openssl
@@ -113,13 +125,13 @@ BuildRequires: php-xmlwriter
 %endif
 
 # composer.json
-Requires:      php(language)                        >= %{php_min_ver}
-Requires:      php-composer(guzzlehttp/guzzle)      <  %{guzzle_max_ver}
-Requires:      php-composer(guzzlehttp/guzzle)      >= %{guzzle_min_ver}
-Requires:      php-composer(guzzlehttp/promises)    <  %{guzzle_promises_max_ver}
-Requires:      php-composer(guzzlehttp/promises)    >= %{guzzle_promises_min_ver}
-Requires:      php-composer(guzzlehttp/psr7)        <  %{guzzle_psr7_max_ver}
-Requires:      php-composer(guzzlehttp/psr7)        >= %{guzzle_psr7_min_ver}
+Requires:      php(language) >= %{php_min_ver}
+Requires:      php-composer(guzzlehttp/guzzle) <  %{guzzle_max_ver}
+Requires:      php-composer(guzzlehttp/guzzle) >= %{guzzle_min_ver}
+Requires:      php-composer(guzzlehttp/promises) <  %{guzzle_promises_max_ver}
+Requires:      php-composer(guzzlehttp/promises) >= %{guzzle_promises_min_ver}
+Requires:      php-composer(guzzlehttp/psr7) <  %{guzzle_psr7_max_ver}
+Requires:      php-composer(guzzlehttp/psr7) >= %{guzzle_psr7_min_ver}
 Requires:      php-composer(mtdowling/jmespath.php) <  %{jmespath_max_ver}
 Requires:      php-composer(mtdowling/jmespath.php) >= %{jmespath_min_ver}
 # phpcompatinfo (computed from version 3.30.0)
@@ -163,6 +175,9 @@ Autoloader: %{phpdir}/Aws3/autoload.php
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
+: Fix for PHP 7.2
+%patch0 -p1
+
 
 %build
 : Create autoloader
@@ -239,10 +254,9 @@ export AWS_ACCESS_KEY_ID=foo
 export AWS_SECRET_ACCESS_KEY=bar
 
 : Upstream tests
-# 7.2: There were 8 errors:
 RETURN_CODE=0
 PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" php56 php70 php71; do
+for PHP_EXEC in "" php56 php70 php71 php72; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT -d memory_limit=1G --verbose  --testsuite=unit \
             --bootstrap bootstrap.php || RETURN_CODE=1
@@ -265,6 +279,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Sat Jun 24 2017 Shawn Iwinski <shawn@iwin.ski> - 3.30.0-2
+- Add patch to fix PHP 7.2 failures
+- Add php72 to SCL tests
+- Add max versions to some additional BuildRequires dependencies
+
 * Wed Jun 21 2017 Shawn Iwinski <shawn@iwin.ski> - 3.30.0-1
 - Updated to 3.30.0 (RHBZ #1449422)