rpm: proper values for License, Publisher, etc
diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile index ed7f6c1..a7b1a88 100644 --- a/rpm/SPECS/Makefile +++ b/rpm/SPECS/Makefile
@@ -27,19 +27,22 @@ MODULE_SUMMARY_PREFIX= NGINX Plus TARGET_VERSION=$(PLUS_VERSION) MODULE_SUFFIX=-plus +MODULE_PACKAGER= Nginx Software, Inc. <https://www.nginx.com> +MODULE_PACKAGE_VENDOR= Nginx Software, Inc. +MODULE_PACKAGE_URL= https://www.nginx.com/ +MODULE_PACKAGE_LICENSE= Proprietary (EULA included) else MODULE_SUMMARY_PREFIX= nginx TARGET_VERSION=$(BASE_VERSION) +MODULE_PACKAGE_VENDOR= Nginx, Inc. +MODULE_PACKAGE_URL= https://nginx.org/ +MODULE_PACKAGE_LICENSE=2-clause BSD-like license endif MODULE_SPEC_TEMPLATE= nginx$(MODULE_SUFFIX)-module.spec.in MODULE_PACKAGE_PREFIX=nginx$(MODULE_SUFFIX)-module MODULE_TARGET_PREFIX=$(TARGET_VERSION)+ -MODULE_PACKAGE_VENDOR= Nginx, Inc. -MODULE_PACKAGE_URL= https://nginx.org/ -MODULE_PACKAGE_LICENSE=2-clause BSD-like license - BASE_MODULES= geoip image-filter njs perl xslt MODULES= @@ -248,6 +251,7 @@ post=`echo "$$MODULE_POST_$(call modname, $*)" | sed -e ':a' -e 'N' -e '$$!ba' -e "s/\n/\$$CR/g"` ; \ cat $(MODULE_SPEC_TEMPLATE) | sed \ -e "s#%%NAME%%#$${pkgname}#g" \ + -e "s#%%MODULE_PACKAGER%%#$(MODULE_PACKAGER)#g" \ -e "s#%%MODULE_PACKAGE_VENDOR%%#$(MODULE_PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_PACKAGE_URL%%#$(MODULE_PACKAGE_URL)#g" \ -e "s#%%MODULE_PACKAGE_LICENSE%%#$(MODULE_PACKAGE_LICENSE)#g" \
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in index d1acb23..b142dc4 100644 --- a/rpm/SPECS/nginx-plus-module.spec.in +++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -68,6 +68,7 @@ BuildRequires: pcre-devel Requires: nginx-plus-r%{plus_version} Provides: %{name}-r%{plus_version} +Packager: %%MODULE_PACKAGER%% %description NGINX Plus: %%SHORT_SUMMARY%%.