[nx-libs: 4/4] Merge branch 'el6'

[Orion Poplawski]

commit 57ef4ba4b42c20f25a14092aee28e2d2d1abf797
Merge: 3d8b197 4cf74c0
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Jan 5 20:50:19 2014 -0700

    Merge branch 'el6'

 nx-libs.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc nx-libs.spec
index 1df0345,21e122a..9d183e5
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@@ -1,8 -1,10 +1,10 @@@
+ # _hardened_build not working for EL6, at least define __global_ldflags for now
  %global _hardened_build 1
+ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
  
  Name:           nx-libs
 -Version:        3.5.0.21
 -Release:        5%{?dist}
 +Version:        3.5.0.22
 +Release:        1%{?dist}
  Summary:        NX X11 protocol compression libraries
  
  Group:          System Environment/Libraries