rpm: disabled building on CentOS < 7.4, dist reverted back to "el7".
diff --git a/build_module.sh b/build_module.sh index 0cab571..e593372 100755 --- a/build_module.sh +++ b/build_module.sh
@@ -130,11 +130,6 @@ PKG_FMT=rpm NGINX_PACKAGES="pcre-devel zlib-devel openssl-devel" DEVEL_PACKAGES="rpm-build" - case `rpm --eval '%{dist}'` in - .el7*) - DEVEL_PACKAGES="$DEVEL_PACKAGES redhat-lsb-core" - ;; - esac PACKAGING_ROOT=${HOME}/rpmbuild/ PACKAGING_DIR=rpm/SPECS PACKAGE_SOURCES_DIR=../SOURCES
diff --git a/rpm/SPECS/nginx-module.spec.in b/rpm/SPECS/nginx-module.spec.in index c4aee82..5b2f952 100644 --- a/rpm/SPECS/nginx-module.spec.in +++ b/rpm/SPECS/nginx-module.spec.in
@@ -13,16 +13,10 @@ %endif %if 0%{?rhel} == 7 -BuildRequires: redhat-lsb-core %define epoch 1 Epoch: %{epoch} -%define os_minor %(lsb_release -rs | cut -d '.' -f 2) -%if %{os_minor} >= 4 -%define dist .el7_4 -%else %define dist .el7 %endif -%endif %%MODULE_DEFINITIONS%%
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in index 1976520..7a423d7 100644 --- a/rpm/SPECS/nginx-plus-module.spec.in +++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -13,14 +13,8 @@ %endif %if 0%{?rhel} == 7 -BuildRequires: redhat-lsb-core -%define os_minor %(lsb_release -rs | cut -d '.' -f 2) -%if %{os_minor} >= 4 -%define dist .el7_4 -%else %define dist .el7 %endif -%endif %%MODULE_DEFINITIONS%%
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in index 68b71c4..4fcfd20 100644 --- a/rpm/SPECS/nginx.spec.in +++ b/rpm/SPECS/nginx.spec.in
@@ -24,22 +24,14 @@ %endif %if 0%{?rhel} == 7 -BuildRequires: redhat-lsb-core %define _group System Environment/Daemons %define epoch 1 Epoch: %{epoch} Requires(pre): shadow-utils -%define os_minor %(lsb_release -rs | cut -d '.' -f 2) -%if %{os_minor} >= 4 Requires: openssl >= 1.0.2 BuildRequires: openssl-devel >= 1.0.2 -%define dist .el7_4 -%else -Requires: openssl >= 1.0.1 -BuildRequires: openssl-devel >= 1.0.1 %define dist .el7 %endif -%endif %if 0%{?suse_version} >= 1315 %define _group Productivity/Networking/Web/Servers