[npm] fix up symlinks for unversioned docdirs

T.C. Hollingsworth patches at fedoraproject.org
Thu Aug 8 03:43:56 UTC 2013


commit 5714ae96798a26b30b5117976de4366d573e1137
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Aug 7 20:39:48 2013 -0700

    fix up symlinks for unversioned docdirs
    
    DO NOT BACKPORT THIS COMMIT TO PREVIOUS FEDORA RELEASES

 npm.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/npm.spec b/npm.spec
index 38149b1..9c11ab5 100644
--- a/npm.spec
+++ b/npm.spec
@@ -60,8 +60,8 @@ touch %{buildroot}%{_sysconfdir}/npmignore
 mkdir -p %{buildroot}%{_mandir}
 cp -pr man/* %{buildroot}%{_mandir}/
 
-ln -sf %{_defaultdocdir}/%{name}-%{version} %{buildroot}%{nodejs_sitelib}/npm/doc
-ln -sf %{_defaultdocdir}/%{name}-%{version}/html %{buildroot}%{nodejs_sitelib}/npm/html
+ln -sf %{_pkgdocdir} %{buildroot}%{nodejs_sitelib}/npm/doc
+ln -sf %{_pkgdocdir}/html %{buildroot}%{nodejs_sitelib}/npm/html
 
 %nodejs_symlink_deps
 
@@ -86,6 +86,7 @@ rm -rf %{buildroot}
 * Thu Aug 08 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.3.6-4
 - remove unnecessary symlink to mandir
   fixes upgrade path from certain older versions of npm
+- fix up symlinks for unversioned docdirs
 
 * Mon Aug 05 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.3.6-3
 - fix up system docdir patch for unversioned docdirs


More information about the scm-commits mailing list