rpms/nodejs
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/nodejs18.git synced 2024-11-24 17:44:23 +00:00
Code Issues 7 Projects Releases Packages Wiki Activity Actions

Fix file conflicts

Browse source 
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2022-04-29 10:28:43 -04:00
parent ebd646b74a
commit 052736ba79
No known key found for this signature in database
GPG key ID: 45DB85A568286D11
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nodejs.spec
View file

@ -40,7 +40,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 1 %global baserelease 2
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
@ -304,6 +304,9 @@ Requires: nodejs-packaging
Requires: libuv-devel%{?_isa} Requires: libuv-devel%{?_isa}
%endif %endif
# Make it conflict with any other version of nodejs-devel
Conflicts: %{name}-devel
%description devel %description devel
Development headers for the Node.js JavaScript runtime. Development headers for the Node.js JavaScript runtime.
@ -680,6 +683,10 @@ end
%changelog %changelog
* Fri Apr 29 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.15.0-2
- Fix file conflicts.
- Make dependency on nodejs-libs more strict.
* Wed Apr 27 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.15.0-1 * Wed Apr 27 2022 Stephen Gallagher <sgallagh@redhat.com> - 1:16.15.0-1
- Update to Node.js 16.15.0 - Update to Node.js 16.15.0
- Stop carrying full ICU sources now that the binary data is available - Stop carrying full ICU sources now that the binary data is available