[npm/el6: 1/2] remove unnecessary symlink to mandir

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


commit c6d4c41a489bd3448368495730e8e396ded18272
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Aug 7 20:37:35 2013 -0700

    remove unnecessary symlink to mandir
    
      fixes upgrade path from certain older versions of npm
    
    (cherry picked from commit 8fcf6ba3996aff5a0fb254a900d846e12cafcc3a)
    
    Conflicts:
    	npm.spec

 npm.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/npm.spec b/npm.spec
index 44a49d9..3542697 100644
--- a/npm.spec
+++ b/npm.spec
@@ -2,7 +2,7 @@
 
 Name:       npm
 Version:    1.3.6
-Release:    2%{?dist}
+Release:    4%{?dist}
 Summary:    Node.js Package Manager
 License:    Artistic 2.0
 Group:      Development/Tools
@@ -60,7 +60,6 @@ touch %{buildroot}%{_sysconfdir}/npmignore
 mkdir -p %{buildroot}%{_mandir}
 cp -pr man/* %{buildroot}%{_mandir}/
 
-ln -sf %{_mandir} %{buildroot}%{nodejs_sitelib}/npm/man
 ln -sf %{_defaultdocdir}/%{name}-%{version} %{buildroot}%{nodejs_sitelib}/npm/doc
 ln -sf %{_defaultdocdir}/%{name}-%{version}/html %{buildroot}%{nodejs_sitelib}/npm/html
 
@@ -84,6 +83,10 @@ rm -rf %{buildroot}
 %doc AUTHORS doc html README.md LICENSE
 
 %changelog
+* 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
+
 * Tue Jul 30 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.3.6-2
 - license changed from MITNFA to Artistic 2.0
 


More information about the scm-commits mailing list