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

Drop Conflicts: from main package.

Browse Source 
It wasn't needed and was breaking upgrades in some cases.
- Move npm support files into the npm package
- Mark manpages as %doc
This commit is contained in:
Stephen Gallagher 2016-09-16 14:33:18 -04:00
parent 72ef125748
commit 32ad0b1e76
No known key found for this signature in database
GPG Key ID: 7A25556236BAA3A3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nodejs.spec
View File

@ -65,7 +65,7 @@ Name: nodejs
Epoch: 1 Epoch: 1
Version: %{nodejs_version} Version: %{nodejs_version}
# Keep this release > 100 for F25+ due to a complicated npm upgrade bug # Keep this release > 100 for F25+ due to a complicated npm upgrade bug
Release: 105%{?dist} Release: 106%{?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
@ -162,7 +162,6 @@ Provides: bundled(http-parser) = %{http_parser_version}
Requires: npm = %{npm_epoch}:%{npm_version}-%{release} Requires: npm = %{npm_epoch}:%{npm_version}-%{release}
%else %else
Recommends: npm = %{npm_epoch}:%{npm_version}-%{release} Recommends: npm = %{npm_epoch}:%{npm_version}-%{release}
Conflicts: npm < %{npm_epoch}:%{npm_version}-%{release}
%endif %endif
@ -359,10 +358,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%license LICENSE %license LICENSE
%doc AUTHORS CHANGELOG.md COLLABORATOR_GUIDE.md GOVERNANCE.md README.md %doc AUTHORS CHANGELOG.md COLLABORATOR_GUIDE.md GOVERNANCE.md README.md
%doc ROADMAP.md WORKING_GROUPS.md %doc ROADMAP.md WORKING_GROUPS.md
%{_prefix}/lib/node_modules/npm %doc %{_mandir}/man*/*
%ghost %{_sysconfdir}/npmrc
%ghost %{_sysconfdir}/npmignore
%{_mandir}/man*/*
%files devel %files devel
@ -376,7 +372,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%files -n npm %files -n npm
%{_bindir}/npm %{_bindir}/npm
%{_prefix}/lib/node_modules/npm
%ghost %{_sysconfdir}/npmrc
%ghost %{_sysconfdir}/npmignore
%files docs %files docs
%dir %{_pkgdocdir} %dir %{_pkgdocdir}
@ -385,6 +383,12 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
%{_pkgdocdir}/npm/doc %{_pkgdocdir}/npm/doc
%changelog %changelog
* Fri Sep 16 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.6.0-106
- Drop Conflicts: from main package.
It wasn't needed and was breaking upgrades in some cases.
- Move npm support files into the npm package
- Mark manpages as %%doc
* Fri Sep 16 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.6.0-105 * Fri Sep 16 2016 Stephen Gallagher <sgallagh@redhat.com> - 1:6.6.0-105
- Update to 6.6.0 - Update to 6.6.0
- https://github.com/nodejs/node/blob/v6.6.0/doc/changelogs/CHANGELOG_V6.md#6.6.0 - https://github.com/nodejs/node/blob/v6.6.0/doc/changelogs/CHANGELOG_V6.md#6.6.0