[glusterfs/el5: 3/3] Merge remote-tracking branch 'origin/master' into el5

[Kaleb S. KEITHLEY]

commit da09a375429019aa8f0aa319b481a62e8fc57df4
Merge: fb91b7d 3796ec7
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jul 25 00:21:34 2013 -0400

    Merge remote-tracking branch 'origin/master' into el5
    
    glusterfs-3.4.0-3, sync with gluster glusterfs.spec.in and esp.
    glusterd.service w/o Wants=glusterfsd.service

 glusterfs.spec |   57 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 28 deletions(-)
---
diff --cc glusterfs.spec
index 798a478,266461f..32e3369
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -35,10 -35,10 +35,14 @@@
  # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at tar.gz --without ufo
  %{?_without_ufo:%global _without_ufo true}
  
 +%if ( 0%{?rhel} && 0%{?rhel} < 6 )
 +ExcludeArch: ppc
 +%endif
 +
+ %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
+ %global           _with_systemd true
+ %endif
+ 
  %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
  %global           SWIFTVER 1.8.0
  %if ( 0%{_for_fedora_koji_builds} )