diff options
| -rw-r--r--[-rwxr-xr-x] | composer.json | 3 | ||||
| -rw-r--r-- | php-aws-php-sns-message-validator.spec | 34 |
2 files changed, 26 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 93415f0..ad5e86e 100755..100644 --- a/composer.json +++ b/composer.json @@ -30,5 +30,8 @@ }, "autoload-dev": { "psr-4": { "Aws\\Sns\\": "tests/" } + }, + "scripts": { + "test": "phpunit" } } diff --git a/php-aws-php-sns-message-validator.spec b/php-aws-php-sns-message-validator.spec index f2d0d68..195e95c 100644 --- a/php-aws-php-sns-message-validator.spec +++ b/php-aws-php-sns-message-validator.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-aws-php-sns-message-validator # -# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner aws %global github_name aws-php-sns-message-validator -%global github_version 1.3.0 -%global github_commit 4f6c042df3a0de832d36e7413ccaa24c584aa1a2 +%global github_version 1.5.0 +%global github_commit 84e0f665d5825b0d9c546e0a0de89465b4c6b53a %global composer_vendor aws %global composer_project aws-php-sns-message-validator @@ -37,7 +37,6 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Amazon SNS message validation -Group: Development/Libraries License: ASL 2.0 URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -47,13 +46,18 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-openssl +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(guzzlehttp/psr7) >= %{guzzlehttp_psr7_min_ver} with php-composer(guzzlehttp/psr7) < %{guzzlehttp_psr7_max_ver}) +BuildRequires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver}) +%else BuildRequires: php-composer(guzzlehttp/psr7) < %{guzzlehttp_psr7_max_ver} BuildRequires: php-composer(guzzlehttp/psr7) >= %{guzzlehttp_psr7_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} -BuildRequires: php-openssl -## phpcompatinfo (computed from version 1.3.0) +%endif +## phpcompatinfo (computed from version 1.5.0) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre @@ -64,10 +68,14 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(psr/http-message) >= %{psr_http_message_min_ver} with php-composer(psr/http-message) < %{psr_http_message_max_ver}) +%else Requires: php-composer(psr/http-message) < %{psr_http_message_max_ver} Requires: php-composer(psr/http-message) >= %{psr_http_message_min_ver} +%endif Requires: php-openssl -# phpcompatinfo (computed from version 1.3.0) +# phpcompatinfo (computed from version 1.5.0) Requires: php-json Requires: php-pcre Requires: php-spl @@ -114,8 +122,8 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/Aws/Sns -cp -rp src/* %{buildroot}%{phpdir}/Aws/Sns/ +mkdir -p %{buildroot}%{phpdir}/Aws +cp -rp src %{buildroot}%{phpdir}/Aws/Sns %check @@ -135,7 +143,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72; do +for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -157,6 +165,10 @@ exit $RETURN_CODE %changelog +* Sun Jun 16 2019 Shawn Iwinski <shawn@iwin.ski> - 1.5.0-1 +- Update to 1.5.0 (RHBZ #1496609) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 + * Fri Sep 08 2017 Shawn Iwinski <shawn@iwin.ski> - 1.3.0-1 - Update to 1.3.0 (RHBZ #1486494) |