[nodejs/el6: 7/7] Merge branch 'master' into el6

[T.C. Hollingsworth]

commit 1040a1f5976064c858349090c28dff5fd16ff9de
Merge: d811319 df8da1f
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Dec 27 19:30:16 2012 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	nodejs.spec

 .gitignore                                         |    1 +
 ...-allow-linking-against-system-http_parser.patch |  117 ---------------
 ...build-allow-linking-against-system-c-ares.patch |  117 ---------------
 ...-build-allow-linking-against-system-libuv.patch |  117 ---------------
 macros.nodejs                                      |   12 ++
 nodejs-symlink-deps                                |   43 ++++++
 nodejs.attr                                        |    3 +
 nodejs.prov                                        |   45 ++++++
 nodejs.req                                         |  152 ++++++++++++++++++++
 nodejs.spec                                        |   61 +++++++--
 sources                                            |    2 +-
 11 files changed, 306 insertions(+), 364 deletions(-)
---
diff --cc nodejs.spec
index 0f3e1c3,5ba3341..540dbfe
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -12,7 -17,9 +17,9 @@@ BuildRequires: libuv-devel >= %{version
  BuildRequires: c-ares-devel
  BuildRequires: zlib-devel
  # Node.js requires some features from openssl 1.0.1 for SPDY support
 -BuildRequires: openssl-devel >= 1:1.0.1
 +BuildRequires: openssl-devel
+ #virtual provides for automatic depedency generation
+ Provides: nodejs(engine) = %{version}
  
  # Exclusive archs must match v8
  ExclusiveArch: %{ix86} x86_64 %{arm}
@@@ -103,11 -124,24 +124,27 @@@ rm -f %{_defaultdocdir}/%{name}-docs-%{
  %doc ChangeLog LICENSE README.md AUTHORS
  %{_bindir}/node
  %{_mandir}/man1/node.*
+ %{_sysconfdir}/rpm/macros.nodejs
+ %{_rpmconfigdir}/fileattrs/nodejs.attr
+ %{_rpmconfigdir}/nodejs*
+ %dir %{_prefix}/lib/node_modules
+ 
+ %files docs
+ %{_defaultdocdir}/%{name}-docs-%{version}
+ %doc LICENSE
  
  %changelog
+ * Wed Dec 26 2012 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.9.4-1
+ - new upstream release 0.9.4
+ - system library patches are now upstream
+ - respect optflags
+ - include documentation in subpackage
+ - add RPM dependency generation and related magic
+ - guard libuv depedency so it always gets bumped when nodejs does
+ 
 +* Thu Dec 20 2012 Stephen Gallagher <sgallagh at redhat.com> - 0.9.3-9
 +- Drop requirement on openssl 1.0.1
 +
  * Wed Dec 19 2012 Dan Horák <dan[at]danny.cz> - 0.9.3-8
  - set exclusive arch list to match v8