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

[T.C. Hollingsworth]

commit 010b552f02f2af262a77901eb84a007e200e41e8
Merge: 1040a1f 3c627f3
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jan 1 18:55:28 2013 -0700

    Merge branch 'master' into el6

 .gitignore          |    1 +
 macros.nodejs       |    9 +++++++-
 nodejs-fixdep       |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++
 nodejs-symlink-deps |    5 ++-
 nodejs.req          |    7 +-----
 nodejs.spec         |   19 +++++++++++++++-
 sources             |    2 +-
 7 files changed, 86 insertions(+), 12 deletions(-)
---
diff --cc nodejs.spec
index 540dbfe,09e6b0c..eeebc04
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -17,9 -18,11 +18,11 @@@ BuildRequires: libuv-deve
  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}
+ #provide nodejs-devel until it comes back for real
+ Provides: nodejs-devel = %{version}-%{release}
  
  # Exclusive archs must match v8
  ExclusiveArch: %{ix86} x86_64 %{arm}