rpms/nodejs20
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Tweak some dependencies on EPEL 7 (bz2048589)

Browse Source 
Add (Provides: bundled(zlib))

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2022-01-31 10:40:09 -05:00
parent 6198b7db15
commit f0d01eb002
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nodejs.spec
View File

@ -25,7 +25,7 @@
# This is used by both the nodejs package and the npm subpackage that # This is used by both the nodejs package and the npm subpackage that
# has a separate version - the name is special so that rpmdev-bumpspec # has a separate version - the name is special so that rpmdev-bumpspec
# will bump this rather than adding .1 to the end. # will bump this rather than adding .1 to the end.
%global baserelease 3 %global baserelease 4
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@ -148,7 +148,9 @@ BuildRequires: python%{python3_pkgversion}-jinja2
%if !%{with python3_fixup} %if !%{with python3_fixup}
BuildRequires: python-unversioned-command BuildRequires: python-unversioned-command
%endif %endif
%if !%{with bundled_zlib} %if %{with bundled_zlib}
Provides: bundled(zlib) = %{zlib_version}
%else
BuildRequires: zlib-devel BuildRequires: zlib-devel
%endif %endif
BuildRequires: brotli-devel BuildRequires: brotli-devel
@ -205,9 +207,7 @@ Requires: ca-certificates
Requires: nodejs-libs%{?_isa} = %{nodejs_epoch}:%{version}-%{release} Requires: nodejs-libs%{?_isa} = %{nodejs_epoch}:%{version}-%{release}
# Pull in the full-icu data by default # Pull in the full-icu data by default
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?fedora} || 0%{?rhel} >= 8
Requires: nodejs-full-i18n%{?_isa} = %{nodejs_epoch}:%{version}-%{release}
%else
Recommends: nodejs-full-i18n%{?_isa} = %{nodejs_epoch}:%{version}-%{release} Recommends: nodejs-full-i18n%{?_isa} = %{nodejs_epoch}:%{version}-%{release}
%endif %endif
@ -265,11 +265,10 @@ Requires: (nodejs-packaging if rpm-build)
%endif %endif
# Make sure we keep NPM up to date when we update Node.js # Make sure we keep NPM up to date when we update Node.js
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?fedora} || 0%{?rhel} >= 8
Requires: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
%else
Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
%endif %endif
Conflicts: npm < %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
%description %description
@ -356,9 +355,7 @@ Release: %{npm_release}%{?dist}
Obsoletes: npm < 0:3.5.4-6 Obsoletes: npm < 0:3.5.4-6
Provides: npm = %{npm_epoch}:%{npm_version} Provides: npm = %{npm_epoch}:%{npm_version}
Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{?fedora} || 0%{?rhel} >= 8
Requires: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
%else
Recommends: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Recommends: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
%endif %endif
@ -733,6 +730,10 @@ end
%changelog %changelog
* Mon Jan 31 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.13.2-3
- Tweak some dependencies on EPEL 7 (bz2048589)
- Add (Provides: bundled(zlib))
* Wed Jan 19 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.13.2-3 * Wed Jan 19 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.13.2-3
- Bundle zlib on EPEL 7 - Bundle zlib on EPEL 7