[nodejs/f20: 3/3] Merge branch 'f19' into f20

[T.C. Hollingsworth]

commit c5e2e9472ba43b74bd8ebece5aba9eb169228964
Merge: f6427d6 7379e62
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Dec 19 11:39:45 2013 -0700

    Merge branch 'f19' into f20

 .gitignore  |    2 ++
 nodejs.spec |   13 ++++++-------
 sources     |    2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --cc nodejs.spec
index 01abcbe,ae2520a..9f42e49
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -133,18 -133,11 +133,12 @@@ EO
  chmod 0755 %{buildroot}%{_rpmconfigdir}/nodejs_native.req
  
  #install documentation
 -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html
 -cp -pr doc/* %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html
 -rm -f %{_defaultdocdir}/%{name}-docs-%{version}/html/nodejs.1
 -cp -p LICENSE %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/
 +mkdir -p %{buildroot}%{_pkgdocdir}/html
 +cp -pr doc/* %{buildroot}%{_pkgdocdir}/html
 +rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1
 +cp -p LICENSE %{buildroot}%{_pkgdocdir}/html
 +cp -p ChangeLog LICENSE README.md AUTHORS %{buildroot}%{_pkgdocdir}
  
- #install development headers
- #FIXME: we probably don't really need *.h but node-gyp downloads the whole
- #freaking source tree so I can't be sure ATM
- mkdir -p %{buildroot}%{_includedir}/node
- cp -p src/*.h %{buildroot}%{_includedir}/node
- 
  #node-gyp needs common.gypi too
  mkdir -p %{buildroot}%{_datadir}/node
  cp -p common.gypi %{buildroot}%{_datadir}/node
@@@ -168,10 -157,14 +162,15 @@@
  %{_datadir}/node/common.gypi
  
  %files docs
 -%{_defaultdocdir}/%{name}-docs-%{version}
 +%dir %{_pkgdocdir}
 +%{_pkgdocdir}/html
  
  %changelog
+ * Thu Dec 19 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.24-1
+ - new upstream release 0.10.24
+   http://blog.nodejs.org/2013/12/19/node-v0-10-24-stable/
+ - upstream install script installs the headers now
+ 
  * Thu Dec 12 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.23-1
  - new upstream release 0.10.23
    http://blog.nodejs.org/2013/12/11/node-v0-10-23-stable/