[nodejs/el6: 31/33] Merge branch 'master' into el6

[Stephen Gallagher]

commit a466ba9202e2bd25f2a5b55b8d9bb14e4578476b
Merge: 007bd28 f8a8f5b
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Apr 9 07:41:48 2013 -0400

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

 .gitignore                                    |    4 +
 0004-Build-debugging-symbols-by-default.patch |   25 ----
 macros.nodejs                                 |    8 +-
 nodejs-fixdep                                 |    7 +-
 nodejs-symlink-deps                           |   45 +++++---
 nodejs.attr                                   |    2 +-
 nodejs.req                                    |    5 +-
 nodejs.spec                                   |  146 +++++++++++++++++++++----
 nodejs_native.attr                            |    2 +
 sources                                       |    5 +-
 10 files changed, 178 insertions(+), 71 deletions(-)
---
diff --cc nodejs.spec
index 64d15fb,50f3eeb..8450842
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -18,12 -30,19 +30,22 @@@ 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
++# but we'll try our best
 +BuildRequires: openssl-devel
 +#virtual provides for automatic depedency generation
 +Provides: nodejs(engine) = %{version}
  
- # Exclusive archs must match v8
- ExclusiveArch: %{ix86} x86_64 %{arm}
+ Requires: v8%{?isa} >= %{v8_ge}
+ Requires: v8%{?isa} < %{v8_lt}
+ 
+ #we need ABI virtual provides where SONAMEs aren't enough/not present so deps
+ #break when binary compatibility is broken
+ %global nodejs_abi 0.10
+ Provides: nodejs(abi) = %{nodejs_abi}
+ Provides: nodejs(v8-abi) = %{v8_abi}
+ 
+ #this corresponds to the "engine" requirement in package.json
+ Provides: nodejs(engine) = %{version}
  
  # Node.js currently has a conflict with the 'node' package in Fedora
  # The ham-radio group has agreed to rename their binary for us, but