summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2022-11-04 16:52:19 +0400
committerKonstantin Pavlov <thresh@nginx.com>2022-11-04 16:52:19 +0400
commit2ac4a7527de8fb7ce8cfac05563a542078d65f4b (patch)
tree75233440def961f551b88ea553ddecbb0739e704 /pkg
parent9ea5ed2813c7dc57c8997ef21d779baae19d784c (diff)
downloadunit-2ac4a7527de8fb7ce8cfac05563a542078d65f4b.tar.gz
unit-2ac4a7527de8fb7ce8cfac05563a542078d65f4b.tar.bz2
Packages: relaxed dependencies between modules and base package.
This allows us to update base or single modules packages without updating the whole set.
Diffstat (limited to 'pkg')
-rw-r--r--pkg/deb/Makefile1
-rw-r--r--pkg/deb/debian.module/control.in2
-rw-r--r--pkg/deb/debian/control.in1
-rw-r--r--pkg/rpm/unit.module.spec.in2
-rw-r--r--pkg/rpm/unit.spec.in2
5 files changed, 6 insertions, 2 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index c4f085f8..6595cb45 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -156,6 +156,7 @@ debuild/$(SRCDIR)/debian:
echo '3.0 (quilt)' > debuild/$(SRCDIR)/debian/source/format ; \
cat debian/control.in | sed \
-e "s#%%PACKAGE_VENDOR%%#$(PACKAGE_VENDOR)#g" \
+ -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
> debuild/$(SRCDIR)/debian/control ; \
cat debian/rules.in | sed \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index f5ce8ae4..f82362d1 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -14,7 +14,7 @@ Section: admin
Architecture: any
Depends: lsb-base,
${misc:Depends}, ${shlibs:Depends},
- unit (= %%UNIT_VERSION%%-%%UNIT_RELEASE%%~%%CODENAME%%)%%MODULE_DEPENDS%%
+ unit-r%%UNIT_VERSION%%%%MODULE_DEPENDS%%
Description: %%SUMMARY%%
NGINX Unit is a runtime and delivery environment for modern distributed
applications. It runs the application code in multiple languages
diff --git a/pkg/deb/debian/control.in b/pkg/deb/debian/control.in
index 691bafed..acf834bc 100644
--- a/pkg/deb/debian/control.in
+++ b/pkg/deb/debian/control.in
@@ -14,6 +14,7 @@ Section: admin
Architecture: any
Depends: lsb-base,
${misc:Depends}, ${shlibs:Depends}
+Provides: unit-r%%UNIT_VERSION%%
Description: NGINX Unit
NGINX Unit is a runtime and delivery environment for modern distributed
applications. It runs the application code in multiple languages
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 88a1c33e..bc68a254 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pcre2-devel
-Requires: unit == %%UNIT_VERSION%%-%%UNIT_RELEASE%%%{?dist}.ngx
+Requires: unit-r%%UNIT_VERSION%%
%description
NGINX Unit is a runtime and delivery environment for modern distributed
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 01c08bb8..50eee876 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -47,6 +47,8 @@ Requires(postun): systemd
BuildRequires: pcre2-devel
+Provides: unit-r%{version}
+
%description
NGINX Unit is a runtime and delivery environment for modern distributed
applications. It runs the application code in multiple languages