rpms/nodejs20
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop the epoch on the virtual provides for npm

Browse Source
This commit is contained in:
Stephen Gallagher 2016-05-02 09:16:15 -04:00
parent 00c66ed491
commit bdc896c6d1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodejs.spec
View File

@ -56,7 +56,7 @@
Name: nodejs Name: nodejs
Epoch: 1 Epoch: 1
Version: %{nodejs_version} Version: %{nodejs_version}
Release: 2%{?dist} Release: 3%{?dist}
Summary: JavaScript runtime Summary: JavaScript runtime
License: MIT and ASL 2.0 and ISC and BSD License: MIT and ASL 2.0 and ISC and BSD
Group: Development/Languages Group: Development/Languages
@ -136,9 +136,13 @@ Provides: bundled(http-parser) = %{http_parser_version}
# We used to ship npm separately, but it is so tightly integrated with Node.js # We used to ship npm separately, but it is so tightly integrated with Node.js
# (and expected to be present on all Node.js systems) that we ship it bundled # (and expected to be present on all Node.js systems) that we ship it bundled
# now. # now.
Provides: npm = %{epoch}:%{npm_version}
Provides: npm(npm) = %{epoch}:%{npm_version}
Obsoletes: npm < 0:3.5.4-6 Obsoletes: npm < 0:3.5.4-6
Provides: npm = %{epoch}:%{npm_version}
# Do not add epoch to the virtual NPM provides or it will break
# the automatic dependency-generation script.
Provides: npm(npm) = %{npm_version}
%description %description
Node.js is a platform built on Chrome's JavaScript runtime Node.js is a platform built on Chrome's JavaScript runtime
@ -282,6 +286,7 @@ rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/html \
ln -sf %{_pkgdocdir} %{buildroot}%{_prefix}/lib/node_modules/npm/html ln -sf %{_pkgdocdir} %{buildroot}%{_prefix}/lib/node_modules/npm/html
ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc
%check %check
# Fail the build if the versions don't match # Fail the build if the versions don't match
%{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.node, '%{nodejs_version}')" %{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.node, '%{nodejs_version}')"
@ -310,6 +315,7 @@ ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc
%{_bindir}/npm %{_bindir}/npm
%{_mandir}/man*/* %{_mandir}/man*/*
%files devel %files devel
%if %{?with_debug} == 1 %if %{?with_debug} == 1
%{_bindir}/node_g %{_bindir}/node_g
@ -325,6 +331,9 @@ ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Tue May 03 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:5.11.0-3
- Drop the epoch on the virtual provides for npm
* Thu Apr 28 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:5.11.0-2 * Thu Apr 28 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:5.11.0-2
- Add epoch and rebuild to preserve upgrade path - Add epoch and rebuild to preserve upgrade path