rpms/nodejs
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/nodejs18.git synced 2024-11-25 01:45:35 +00:00
Code Issues 7 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into epel7

Browse source
This commit is contained in:
Stephen Gallagher 2016-11-08 17:07:05 -05:00
commit 505e35f2bd
No known key found for this signature in database
GPG key ID: 7A25556236BAA3A3
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
nodejs.spec
View file

@ -19,7 +19,7 @@
%global nodejs_patch 1 %global nodejs_patch 1
%global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 1 %global nodejs_release 4
# == Bundled Dependency Versions == # == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h # v8 - from deps/v8/include/v8-version.h
@ -170,9 +170,9 @@ Provides: bundled(http-parser) = %{http_parser_version}
# 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%{?epel} %if 0%{?epel}
# EPEL doesn't support Recommends, so make it strict # EPEL doesn't support Recommends, so make it strict
Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release} Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
%else %else
Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release} Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
%endif %endif
@ -186,7 +186,7 @@ real-time applications that run across distributed devices.
%package devel %package devel
Summary: JavaScript runtime - development headers Summary: JavaScript runtime - development headers
Group: Development/Languages Group: Development/Languages
Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
Requires: libuv-devel%{?_isa} Requires: libuv-devel%{?_isa}
Requires: openssl-devel%{?_isa} Requires: openssl-devel%{?_isa}
Requires: zlib-devel%{?_isa} Requires: zlib-devel%{?_isa}
@ -224,8 +224,8 @@ BuildArch: noarch
# We don't require that the main package be installed to # We don't require that the main package be installed to
# use the docs, but if it is installed, make sure the # use the docs, but if it is installed, make sure the
# version always matches # version always matches
Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{release} Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{release} Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
%description docs %description docs
The API documentation for the Node.js JavaScript runtime. The API documentation for the Node.js JavaScript runtime.
@ -403,7 +403,13 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Thu Oct 20 2016 Stephen Gallagher <sgallagh@redhat.com> - - * Tue Nov 08 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.9.1-4
- Fix incorrect Conflicts for nodejs-docs
* Tue Nov 08 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.9.1-2
- Bump revision and rebuild for s390x
* Thu Oct 20 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.9.1-1
- Update to 6.9.1 LTS release - Update to 6.9.1 LTS release
- Fix a regression introduced in v6.8.0 in readable stream that caused unpipe - Fix a regression introduced in v6.8.0 in readable stream that caused unpipe
to remove the wrong stream to remove the wrong stream