summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-06 10:26:31 +0200
committerRemi Collet <remi@remirepo.net>2020-04-06 10:26:31 +0200
commitb040455909cf3607107f58618364aab8f0037046 (patch)
tree5a5b36816254aeec9d41806a4a210259df5f3554
parent9dac34787b5bae184950c4ecf569381802a876fe (diff)
v1.6.0 from FedoraHEADmaster
-rw-r--r--php-aws-php-sns-message-validator.spec24
1 files changed, 17 insertions, 7 deletions
diff --git a/php-aws-php-sns-message-validator.spec b/php-aws-php-sns-message-validator.spec
index 195e95c..39a3b61 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-2019 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2020 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.5.0
-%global github_commit 84e0f665d5825b0d9c546e0a0de89465b4c6b53a
+%global github_version 1.6.0
+%global github_commit ba6810807ac8936317021ccc14cdb1297d525ae1
%global composer_vendor aws
%global composer_project aws-php-sns-message-validator
@@ -30,6 +30,13 @@
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
+# Range dependencies supported?
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global with_range_dependencies 1
+%else
+%global with_range_dependencies 0
+%endif
+
%{!?phpdir: %global phpdir %{_datadir}/php}
Name: php-%{composer_project}
@@ -48,7 +55,7 @@ BuildArch: noarch
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-openssl
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%if %{with_range_dependencies}
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
@@ -57,7 +64,7 @@ BuildRequires: php-composer(guzzlehttp/psr7) >= %{guzzlehttp_psr7_min_ver}
BuildRequires: php-composer(psr/http-message) < %{psr_http_message_max_ver}
BuildRequires: php-composer(psr/http-message) >= %{psr_http_message_min_ver}
%endif
-## phpcompatinfo (computed from version 1.5.0)
+## phpcompatinfo (computed from version 1.6.0)
BuildRequires: php-date
BuildRequires: php-json
BuildRequires: php-pcre
@@ -68,14 +75,14 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%if %{with_range_dependencies}
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.5.0)
+# phpcompatinfo (computed from version 1.6.0)
Requires: php-json
Requires: php-pcre
Requires: php-spl
@@ -165,6 +172,9 @@ exit $RETURN_CODE
%changelog
+* Sun Apr 05 2020 Shawn Iwinski <shawn@iwin.ski> - 1.6.0-1
+- Update to 1.6.0 (RHBZ #1771129)
+
* 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