technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: switched to common address for package maintainers.

Browse Source
This commit is contained in:
Andrei Belov
2021-04-21 16:07:26 +03:00
parent 5b332cae83
commit f90754f84a
7 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/deb/Makefile
View File

@@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1
VERSION ?= $(DEFAULT_VERSION) VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
SRCDIR= unit-$(VERSION) SRCDIR= unit-$(VERSION)
CODENAME = $(shell lsb_release -cs) CODENAME = $(shell lsb_release -cs)
@@ -205,6 +207,9 @@ debuild/$(SRCDIR)/debian:
echo '9' > debuild/$(SRCDIR)/debian/compat ; \ echo '9' > debuild/$(SRCDIR)/debian/compat ; \
mkdir -p debuild/$(SRCDIR)/debian/source ; \ mkdir -p debuild/$(SRCDIR)/debian/source ; \
echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \ 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 \ cat debian/rules.in | sed \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
> debuild/$(SRCDIR)/debian/rules ; \ > debuild/$(SRCDIR)/debian/rules ; \
@@ -280,6 +285,7 @@ endif
-e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
-e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \ -e "s#%%VERSION%%#$(MODULE_VERSION_$*)#g" \
-e "s#%%RELEASE%%#$(MODULE_RELEASE_$*)#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_BUILD_DEPENDS%%#$(MODULE_BUILD_DEPENDS_$*)#g" \
-e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \ -e "s#%%MODULE_DEPENDS%%#$(MODULE_DEPENDS_$*)#g" \
> $@/$(SRCDIR)/debian/control ; \ > $@/$(SRCDIR)/debian/control ; \

2
pkg/deb/debian.module/control-noarch.in
View File

@@ -1,7 +1,7 @@
Source: %%NAME%% Source: %%NAME%%
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Andrei Belov <defan@nginx.com> Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
linux-libc-dev%%MODULE_BUILD_DEPENDS%% linux-libc-dev%%MODULE_BUILD_DEPENDS%%
Standards-Version: 3.9.5 Standards-Version: 3.9.5

2
pkg/deb/debian.module/control.in
View File

@@ -1,7 +1,7 @@
Source: %%NAME%% Source: %%NAME%%
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Andrei Belov <defan@nginx.com> Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
linux-libc-dev, linux-libc-dev,
libssl-dev, libssl-dev,

2
pkg/deb/debian/control → pkg/deb/debian/control.in
View File

@@ -1,7 +1,7 @@
Source: unit Source: unit
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Andrei Belov <defan@nginx.com> Maintainer: %%PACKAGE_VENDOR%%
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
linux-libc-dev, linux-libc-dev,
libssl-dev, libssl-dev,

4
pkg/rpm/Makefile
View File

@@ -8,6 +8,8 @@ DEFAULT_RELEASE := 1
VERSION ?= $(DEFAULT_VERSION) VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE) RELEASE ?= $(DEFAULT_RELEASE)
PACKAGE_VENDOR = NGINX Packaging <nginx-packaging@f5.com>
ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0) ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 6 -a 0%{?amzn} -eq 0'`; echo $$?), 0)
OSVER = centos6 OSVER = centos6
else ifeq ($(shell test `rpm --eval '0%{?rhel} -eq 7 -a 0%{?amzn} -eq 0'`; echo $$?), 0) 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" \ sed -e "s#%%VERSION%%#$(VERSION)#g" \
-e "s#%%RELEASE%%#$(RELEASE)#g" \ -e "s#%%RELEASE%%#$(RELEASE)#g" \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
> rpmbuild/SPECS/unit.spec > rpmbuild/SPECS/unit.spec
cd ../../docs && make ../build/unit.rpm-changelog cd ../../docs && make ../build/unit.rpm-changelog
ifneq ($(DEFAULT_VERSION)$(DEFAULT_RELEASE), $(VERSION)$(RELEASE)) 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#%%RELEASE%%#$(MODULE_RELEASE_$*)#g" \
-e "s#%%UNIT_VERSION%%#$(VERSION)#g" \ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
-e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \ -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
-e "s#%%MODULE_SOURCES%%#$${sources}#g" \ -e "s#%%MODULE_SOURCES%%#$${sources}#g" \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \ -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
-e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \ -e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \

3
pkg/rpm/unit.module.spec.in
View File

@@ -32,9 +32,8 @@ Summary: %%SUMMARY%%
Version: %%VERSION%% Version: %%VERSION%%
Release: %%RELEASE%%%{?dist}.ngx Release: %%RELEASE%%%{?dist}.ngx
License: ASL 2.0 License: ASL 2.0
Vendor: Nginx Software, Inc. Vendor: %%PACKAGE_VENDOR%%
URL: https://unit.nginx.org/ URL: https://unit.nginx.org/
Packager: Nginx Software, Inc. <https://www.nginx.com>
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: unit-%{version}.tar.gz Source0: unit-%{version}.tar.gz

3
pkg/rpm/unit.spec.in
View File

@@ -33,9 +33,8 @@ Summary: NGINX Unit
Version: %%VERSION%% Version: %%VERSION%%
Release: %%RELEASE%%%{?dist}.ngx Release: %%RELEASE%%%{?dist}.ngx
License: ASL 2.0 License: ASL 2.0
Vendor: Nginx Software, Inc. Vendor: %%PACKAGE_VENDOR%%
URL: https://unit.nginx.org/ URL: https://unit.nginx.org/
Packager: Nginx Software, Inc. <https://www.nginx.com>
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: unit-%{version}.tar.gz Source0: unit-%{version}.tar.gz