Amazon Linux: adjusted version numbers for future releases.
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index 01143da..17d1fb6 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -300,14 +300,14 @@
if [ `rpm --eval '0%{?suse_version}'` -gt 0 -a `rpm --eval '0%{?suse_version}'` -lt 1500 -o \
`rpm --eval '0%{?fedora}'` -gt 0 -a `rpm --eval '0%{?fedora}'` -lt 29 -o \
`rpm --eval '0%{?amzn}'` -eq 1 ]; then \
- echo "Brotli can't be build on SLES < 15, Fedora < 29 or Amazon Linux" > \
+ echo "Brotli can't be build on SLES < 15, Fedora < 29 or Amazon Linux 1" > \
nginx-module-$${module}.skip ; \
exit ; \
fi ; \
;; \
geoip) \
- if [ `rpm --eval '0%{?rhel}'` -ge 8 ]; then \
- echo "GeoIP can not be build on RHEL/CentOS >= 8" > \
+ if [ `rpm --eval '0%{?rhel}'` -ge 8 ] || [ `rpm --eval '0%{?amzn}'` -gt 2 ]; then \
+ echo "GeoIP can not be build on RHEL/CentOS >= 8 or Amazon Linux >2" > \
nginx-module-$${module}.skip ; \
exit ; \
fi ; \
@@ -343,6 +343,11 @@
nginx-module-$${module}.skip ; \
exit ; \
fi ; \
+ if [ "`rpm --eval '0%{?amzn}'`" -gt 2 ]; then \
+ echo "OpenTracing can not be built on Amazon Linux >2 due to (temporary) absence yaml-cpp library" > \
+ nginx-module-$${module}.skip ; \
+ exit ; \
+ fi ; \
if [ "`rpm --eval '%{_arch}'`" = "ppc64le" ]; then \
echo "OpenTracing can not be built on ppc64le" > \
nginx-module-$${module}.skip ; \
diff --git a/rpm/SPECS/nginx-module.spec.in b/rpm/SPECS/nginx-module.spec.in
index 5c5b398..cfe2928 100644
--- a/rpm/SPECS/nginx-module.spec.in
+++ b/rpm/SPECS/nginx-module.spec.in
@@ -4,7 +4,7 @@
%if 0%{?rhel} || 0%{?amzn} || 0%{?fedora}
%define _group System Environment/Daemons
-%if 0%{?amzn} >= 2
+%if 0%{?amzn} == 2
BuildRequires: openssl11-devel
%else
BuildRequires: openssl-devel
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in
index e2549a0..2620e70 100644
--- a/rpm/SPECS/nginx-plus-module.spec.in
+++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -10,7 +10,7 @@
%if 0%{?rhel} || 0%{?amzn}
%define _group System Environment/Daemons
-%if 0%{?amzn} >= 2
+%if 0%{?amzn} == 2
BuildRequires: openssl11-devel
%else
BuildRequires: openssl-devel
