From fde0d7c8930a06eef67a1a9c7646a559308cfe49 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 17 Oct 2016 10:03:25 -0400 Subject: [PATCH] Add dist tag to npm nodejs dependency --- nodejs.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 4a6365e..24751a8 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -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 - 1:6.8.1-5 +- Add dist tag to npm nodejs dependency + * Mon Oct 17 2016 Stephen Gallagher - 1:6.8.1-4 - Fix typo in npm nodejs dependency