From f90754f84a375d5183ed6883862d19dfd417225a Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Wed, 21 Apr 2021 16:07:26 +0300 Subject: Packages: switched to common address for package maintainers. --- pkg/deb/Makefile | 6 +++++ pkg/deb/debian.module/control-noarch.in | 2 +- pkg/deb/debian.module/control.in | 2 +- pkg/deb/debian/control | 41 --------------------------------- pkg/deb/debian/control.in | 41 +++++++++++++++++++++++++++++++++ pkg/rpm/Makefile | 4 ++++ pkg/rpm/unit.module.spec.in | 3 +-- pkg/rpm/unit.spec.in | 3 +-- 8 files changed, 55 insertions(+), 47 deletions(-) delete mode 100644 pkg/deb/debian/control create mode 100644 pkg/deb/debian/control.in (limited to 'pkg') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 8c33fc53..d28351d0 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) +PACKAGE_VENDOR = NGINX Packaging + SRCDIR= unit-$(VERSION) CODENAME = $(shell lsb_release -cs) @@ -205,6 +207,9 @@ debuild/$(SRCDIR)/debian: echo '9' > debuild/$(SRCDIR)/debian/compat ; \ mkdir -p debuild/$(SRCDIR)/debian/source ; \ echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \ + cat debian/control.in | sed \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ + > debuild/$(SRCDIR)/debian/control ; \ cat debian/rules.in | sed \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ > debuild/$(SRCDIR)/debian/rules ; \ @@ -280,6 +285,7 @@ endif -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \ -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ > $@/$(SRCDIR)/debian/control ; \ diff --git a/pkg/deb/debian.module/control-noarch.in b/pkg/deb/debian.module/control-noarch.in index e22bb49a..d9d9e5e1 100644 --- a/pkg/deb/debian.module/control-noarch.in +++ b/pkg/deb/debian.module/control-noarch.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev%%MODULE_BUILD_DEPENDS%% Standards-Version: 3.9.5 diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in index 7e28f5e9..9a6fa797 100644 --- a/pkg/deb/debian.module/control.in +++ b/pkg/deb/debian.module/control.in @@ -1,7 +1,7 @@ Source: %%NAME%% Section: admin Priority: extra -Maintainer: Andrei Belov +Maintainer: %%PACKAGE_VENDOR%% Build-Depends: debhelper (>= 9), linux-libc-dev, libssl-dev, diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control deleted file mode 100644 index a8e8cdc4..00000000 --- a/pkg/deb/debian/control +++ /dev/null @@ -1,41 +0,0 @@ -Source: unit -Section: admin -Priority: extra -Maintainer: Andrei Belov -Build-Depends: debhelper (>= 9), - linux-libc-dev, - libssl-dev, - libpcre2-dev -Standards-Version: 3.9.5 -Homepage: https://unit.nginx.org - -Package: unit -Section: admin -Architecture: any -Depends: lsb-base, - ${misc:Depends}, ${shlibs:Depends} -Description: NGINX Unit - NGINX Unit is a runtime and delivery environment for modern distributed - applications. It runs the application code in multiple languages - (PHP, Python, Go, etc.), and tightly couples it with traffic delivery - in and out of the application. Take this application server and proxy - directly in the cloud / container environments and fully control your app - dynamically via an API. - -Package: unit-dbg -Section: debug -Architecture: any -Priority: extra -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (debug symbols) - This package contains the debugging symbols for NGINX Unit. - -Package: unit-dev -Section: libdevel -Priority: optional -Architecture: any -Depends: unit (= ${binary:Version}), - ${misc:Depends} -Description: NGINX Unit (development files) - Library and include files required for NGINX Unit modules development. diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in new file mode 100644 index 00000000..4d59520e --- /dev/null +++ b/pkg/deb/debian/control.in @@ -0,0 +1,41 @@ +Source: unit +Section: admin +Priority: extra +Maintainer: %%PACKAGE_VENDOR%% +Build-Depends: debhelper (>= 9), + linux-libc-dev, + libssl-dev, + libpcre2-dev +Standards-Version: 3.9.5 +Homepage: https://unit.nginx.org + +Package: unit +Section: admin +Architecture: any +Depends: lsb-base, + ${misc:Depends}, ${shlibs:Depends} +Description: NGINX Unit + NGINX Unit is a runtime and delivery environment for modern distributed + applications. It runs the application code in multiple languages + (PHP, Python, Go, etc.), and tightly couples it with traffic delivery + in and out of the application. Take this application server and proxy + directly in the cloud / container environments and fully control your app + dynamically via an API. + +Package: unit-dbg +Section: debug +Architecture: any +Priority: extra +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (debug symbols) + This package contains the debugging symbols for NGINX Unit. + +Package: unit-dev +Section: libdevel +Priority: optional +Architecture: any +Depends: unit (= ${binary:Version}), + ${misc:Depends} +Description: NGINX Unit (development files) + Library and include files required for NGINX Unit modules development. diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index f9c57b5b..e67846cf 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) +PACKAGE_VENDOR = NGINX Packaging + ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) OSVER = centos6 else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) @@ -205,6 +207,7 @@ rpmbuild/SPECS/unit.spec: unit.spec.in ../../docs/changes.xml | rpmbuild/SPECS sed -e "s#%%VERSION%%#$(VERSION)#g" \ -e "s#%%RELEASE%%#$(RELEASE)#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ > rpmbuild/SPECS/unit.spec cd ../../docs && make ../build/unit.rpm-changelog ifneq ($(DEFAULT_VERSION)$(DEFAULT_RELEASE), $(VERSION)$(RELEASE)) @@ -252,6 +255,7 @@ rpmbuild/SPECS/unit-%.spec: unit.module.spec.in ../../docs/changes.xml | rpmbuil -e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ + -e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \ -e "s#%%MODULE_SOURCES%%#$${sources}#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ -e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \ diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in index 101b4991..4f096c73 100644 --- a/pkg/rpm/unit.module.spec.in +++ b/pkg/rpm/unit.module.spec.in @@ -32,9 +32,8 @@ Summary: %%SUMMARY%% Version: %%VERSION%% Release: %%RELEASE%%%{?dist}.ngx License: ASL 2.0 -Vendor: Nginx Software, Inc. +Vendor: %%PACKAGE_VENDOR%% URL: https://unit.nginx.org/ -Packager: Nginx Software, Inc. Group: System Environment/Daemons Source0: unit-%{version}.tar.gz diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 07ca9e6f..b35b8998 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -33,9 +33,8 @@ Summary: NGINX Unit Version: %%VERSION%% Release: %%RELEASE%%%{?dist}.ngx License: ASL 2.0 -Vendor: Nginx Software, Inc. +Vendor: %%PACKAGE_VENDOR%% URL: https://unit.nginx.org/ -Packager: Nginx Software, Inc. Group: System Environment/Daemons Source0: unit-%{version}.tar.gz -- cgit