From e7cfbb014beb388e696adb0ee8dd6710ac90570a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 17:05:57 -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 f0c2031..7e0936e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -144,7 +144,7 @@ Conflicts: node <= 0.3.2-12 # we don't need the seperate nodejs-punycode package, so we Provide it here so # dependent packages don't need to override the dependency generator. # See also: RHBZ#11511811 -# UPDATE: punycode will be deprecated and so we should unbundle it in Node v8 +# UPDATE: punycode will be deprecated and so we should unbundle it in Node v8 # and use upstream module instead # https://github.com/nodejs/node/commit/29e49fc286080215031a81effbd59eac092fff2f Provides: nodejs-punycode = %{punycode_version} @@ -186,7 +186,7 @@ real-time applications that run across distributed devices. %package devel Summary: JavaScript runtime - development headers Group: Development/Languages -Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: libuv-devel%{?_isa} Requires: openssl-devel%{?_isa} Requires: zlib-devel%{?_isa} @@ -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}-%{nodejs_release}%{?dist} +Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} %description docs The API documentation for the Node.js JavaScript runtime.