From 0665a4f9dc95d46435bc26a980a41c2d6cd0923a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 17:01:26 -0500 Subject: [PATCH] Fix incorrect Conflicts for nodejs-docs --- nodejs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 41f3a92..f0c2031 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 3 +%global nodejs_release 4 # == Bundled Dependency Versions == # 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 %if 0%{?epel} # 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 -Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release} +Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %endif @@ -403,7 +403,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog -* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-3 +* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-4 - Fix incorrect Conflicts for nodejs-docs * Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-2