Variables made in line with N+ packaging scheme.
No functional changes.
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile
index f1f3756..7381ba4 100644
--- a/rpm/SPECS/Makefile
+++ b/rpm/SPECS/Makefile
@@ -308,8 +308,8 @@
@{ \
set -e ; \
cat nginx.spec.in | sed \
- -e 's#%%MAIN_VERSION%%#$(BASE_VERSION)#g' \
- -e 's#%%MAIN_RELEASE%%#$(BASE_RELEASE)#g' \
+ -e 's#%%BASE_VERSION%%#$(BASE_VERSION)#g' \
+ -e 's#%%BASE_RELEASE%%#$(BASE_RELEASE)#g' \
-e 's#%%BASE_CONFIGURE_ARGS%%#$(BASE_CONFIGURE_ARGS)#g' \
> nginx.spec ; \
}
@@ -376,8 +376,8 @@
-e "s#%%MODULE_PACKAGE_LICENSE%%#$(MODULE_PACKAGE_LICENSE)#g" \
-e "s#%%SUMMARY%%#$(MODULE_SUMMARY_PREFIX) $(MODULE_SUMMARY_$(call modname, $@))#g" \
-e "s#%%SHORT_SUMMARY%%#$(MODULE_SUMMARY_$(call modname, $@))#g" \
- -e "s#%%MAIN_VERSION%%#$(BASE_VERSION)#g" \
- -e "s#%%MAIN_RELEASE%%#$(BASE_RELEASE)#g" \
+ -e "s#%%BASE_VERSION%%#$(BASE_VERSION)#g" \
+ -e "s#%%BASE_RELEASE%%#$(BASE_RELEASE)#g" \
-e "s#%%PLUS_VERSION%%#$(PLUS_VERSION)#g" \
-e "s#%%VERSION_PREFIX%%#$(MODULE_VERSION_PREFIX_$(call modname, $@))#g" \
-e "s#%%VERSION%%#$(MODULE_VERSION_$(call modname, $@))#g" \
diff --git a/rpm/SPECS/nginx-module.spec.in b/rpm/SPECS/nginx-module.spec.in
index 80bb1bb..f9233d7 100644
--- a/rpm/SPECS/nginx-module.spec.in
+++ b/rpm/SPECS/nginx-module.spec.in
@@ -27,10 +27,10 @@
%%MODULE_DEFINITIONS%%
-%define main_version %%MAIN_VERSION%%
-%define main_release %%MAIN_RELEASE%%%{?dist}.ngx
+%define base_version %%BASE_VERSION%%
+%define base_release %%BASE_RELEASE%%%{?dist}.ngx
-%define bdir %{_builddir}/%{name}-%{main_version}
+%define bdir %{_builddir}/%{name}-%{base_version}
Summary: %%SUMMARY%%
Name: %%NAME%%
@@ -40,7 +40,7 @@
URL: %%MODULE_PACKAGE_URL%%
Group: %{_group}
-Source0: http://nginx.org/download/nginx-%{main_version}.tar.gz
+Source0: http://nginx.org/download/nginx-%{base_version}.tar.gz
Source1: %%COPYRIGHT_SOURCE%%
%%MODULE_SOURCES%%
@@ -48,10 +48,10 @@
License: %%MODULE_PACKAGE_LICENSE%%
-BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{main_release}-root
+BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
BuildRequires: zlib-devel
BuildRequires: pcre-devel
-Requires: nginx == %{?epoch:%{epoch}:}%%MAIN_VERSION%%-%%MAIN_RELEASE%%%{?dist}.ngx
+Requires: nginx == %{?epoch:%{epoch}:}%{base_version}-%{base_release}%{?dist}.ngx
%description
nginx %%SHORT_SUMMARY%%.
@@ -67,7 +67,7 @@
%define MODULE_CONFIGURE_ARGS $(echo "%%MODULE_CONFIGURE_ARGS%%")
%prep
-%setup -qcTn %{name}-%{main_version}
+%setup -qcTn %{name}-%{base_version}
tar --strip-components=1 -zxf %{SOURCE0}
%%MODULE_PREP_SOURCES%%
%%MODULE_PREP_PATCHES%%
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in
index 7a423d7..81c459e 100644
--- a/rpm/SPECS/nginx-plus-module.spec.in
+++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -18,10 +18,11 @@
%%MODULE_DEFINITIONS%%
-%define main_version %%MAIN_VERSION%%
-%define main_release %%MAIN_RELEASE%%%{?dist}.ngx
+%define base_version %%BASE_VERSION%%
+%define base_release %%BASE_RELEASE%%%{?dist}.ngx
+%define plus_version %%PLUS_VERSION%%
-%define bdir %{_builddir}/%{name}-%{main_version}
+%define bdir %{_builddir}/%{name}-%{base_version}
Summary: %%SUMMARY%%
Name: %%NAME%%
@@ -31,7 +32,7 @@
URL: %%MODULE_PACKAGE_URL%%
Group: %{_group}
-Source0: http://nginx.org/download/nginx-%{main_version}.tar.gz
+Source0: http://nginx.org/download/nginx-%{base_version}.tar.gz
Source1: %%COPYRIGHT_SOURCE%%
%%MODULE_SOURCES%%
@@ -39,10 +40,10 @@
License: %%MODULE_PACKAGE_LICENSE%%
-BuildRoot: %{_tmppath}/%{name}-%{main_version}-%{main_release}-root
+BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
BuildRequires: zlib-devel
BuildRequires: pcre-devel
-Requires: nginx-plus-r%%PLUS_VERSION%%
+Requires: nginx-plus-r%{plus_version}
Provides: %{name}-r%{plus_version}
%description
@@ -59,7 +60,7 @@
%define MODULE_CONFIGURE_ARGS $(echo "%%MODULE_CONFIGURE_ARGS%%")
%prep
-%setup -qcTn %{name}-%{main_version}
+%setup -qcTn %{name}-%{base_version}
tar --strip-components=1 -zxf %{SOURCE0}
%%MODULE_PREP_SOURCES%%
%%MODULE_PREP_PATCHES%%
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in
index a5cf1e3..1a78022 100644
--- a/rpm/SPECS/nginx.spec.in
+++ b/rpm/SPECS/nginx.spec.in
@@ -53,8 +53,8 @@
# end of distribution specific definitions
-%define main_version %%MAIN_VERSION%%
-%define main_release %%MAIN_RELEASE%%%{?dist}.ngx
+%define main_version %%BASE_VERSION%%
+%define main_release %%BASE_RELEASE%%%{?dist}.ngx
%define bdir %{_builddir}/%{name}-%{main_version}
