rpms/nodejs20
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect Conflicts for nodejs-docs

Browse Source
This commit is contained in:
Stephen Gallagher 2016-11-08 17:05:57 -05:00
parent 0665a4f9dc
commit e7cfbb014b
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodejs.spec
View File

@ -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 # 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. # dependent packages don't need to override the dependency generator.
# See also: RHBZ#11511811 # 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 # and use upstream module instead
# https://github.com/nodejs/node/commit/29e49fc286080215031a81effbd59eac092fff2f # https://github.com/nodejs/node/commit/29e49fc286080215031a81effbd59eac092fff2f
Provides: nodejs-punycode = %{punycode_version} Provides: nodejs-punycode = %{punycode_version}
@ -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}-%{nodejs_release} Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_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.