[glusterfs/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6 glusterfs-3.4.0beta2 including _hardened_build

[Kaleb S. KEITHLEY]

commit 9420ea9c0a56937490a2f4666abc7dd234b20148
Merge: 535e4c3 e27233f
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri May 24 10:03:12 2013 -0400

    Merge remote-tracking branch 'origin/master' into el6
    glusterfs-3.4.0beta2
    including _hardened_build and bzip2 compressed ChangeLog

 glusterfs.spec |  441 +++++++++++++++++++++++++++++++++++++++++---------------
 sources        |    6 +-
 2 files changed, 328 insertions(+), 119 deletions(-)
---
diff --cc glusterfs.spec
index 4d00987,c008ab0..c5e5640
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -1206,16 -1410,19 +1410,22 @@@ f
  
  
  %postun swift-proxy
- if [ "$1" -ge "1" ] ; then
+ if [ $1 -ge 1 ] ; then
      %_init_restart gluster-swift-proxy
+ %if ( 0%{?fedora} && 0%{?fedora} > 18 )
+     %_init_restart gluster-swift-object-expirer
+ %endif
  fi
  %endif
- 
+ %endif
  
  %changelog
+ * Fri May 24 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.5.beta2
+ - prerelease 3.4.0beta2 for oVirt/vdsm dependencies in Fedora19
+ 
 +* Mon May 13 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-15
 +- hardened build, i.e. PIE. RHBZ 955283
 +
  * Thu May 9 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.4.beta1
  - prerelease 3.4.0beta1 for oVirt/vdsm dependencies in Fedora19