[nodejs: 2/2] Merge branch 'f19'
T.C. Hollingsworth
patches at fedoraproject.org
Wed Aug 14 09:12:59 UTC 2013
commit bb22b1aff533903facd038dd4f51ac1dd973a976
Merge: 93798a9 e9f69b1
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date: Wed Aug 14 02:08:33 2013 -0700
Merge branch 'f19'
Conflicts:
nodejs.spec
nodejs.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc nodejs.spec
index cf66e18,5ee189b..8389f15
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -162,16 -162,12 +162,19 @@@ cp -p common.gypi %{buildroot}%{_datadi
%{_datadir}/node/common.gypi
%files docs
-%{_defaultdocdir}/%{name}-docs-%{version}
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/html
+%exclude %{_pkgdocdir}/(ChangeLog|LICENSE|README.md|AUTHORS)
%changelog
+ * Wed Aug 14 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.14-3
+ - fix typo in _isa macro in v8 Requires
+
+* Mon Aug 05 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.14-2
+- use unversioned docdir for -docs subpackage
+ https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+- use main package's docdir instead of a seperate -docs directory
+
* Thu Jul 25 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.14-1
- new upstream release 0.10.14
http://blog.nodejs.org/2013/07/25/node-v0-10-14-stable/
More information about the scm-commits
mailing list