Add dist tag to npm nodejs dependency

This commit is contained in:
Stephen Gallagher 2016-10-17 10:03:25 -04:00
parent 21ed17b57e
commit fde0d7c893
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3

View File

@ -19,7 +19,7 @@
%global nodejs_patch 1
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
%global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
%global nodejs_release 4
%global nodejs_release 5
# == Bundled Dependency Versions ==
# v8 - from deps/v8/include/v8-version.h
@ -206,7 +206,7 @@ Release: %{npm_release}%{?dist}
# now.
Obsoletes: npm < 0:3.5.4-6
Provides: npm = %{npm_epoch}:%{npm_version}
Requires: nodejs = %{epoch}:%{nodejs_version}-%{nodejs_release}
Requires: nodejs = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
# Do not add epoch to the virtual NPM provides or it will break
# the automatic dependency-generation script.
@ -224,8 +224,8 @@ BuildArch: noarch
# We don't require that the main package be installed to
# use the docs, but if it is installed, make sure the
# version always matches
Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release}
Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release}
Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{release}
Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{release}
%description docs
The API documentation for the Node.js JavaScript runtime.
@ -403,6 +403,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc
%changelog
* Mon Oct 17 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-5
- Add dist tag to npm nodejs dependency
* Mon Oct 17 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.8.1-4
- Fix typo in npm nodejs dependency