Merge remote-tracking branch 'origin/master' into el5

glusterfs-3.4.0-7, glusterfs requires glusterfs-libs

glusterfs.spec

@@ -66,7 +66,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.0
-Release:          6%{?prereltag:.%{prereltag}}%{?dist}
+Release:          7%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -202,6 +202,7 @@ Requires(postun): /sbin/service
 %define _init_gluster_swift_proxy     %{_sysconfdir}/init.d/gluster-swift-proxy
 %endif
 
+Requires:         %{name}-libs = %{version}-%{release}
 BuildRequires:    bison flex
 BuildRequires:    gcc make automake libtool
 BuildRequires:    ncurses-devel readline-devel
@@ -1495,6 +1496,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-7
+- glusterfs requires glusterfs-libs
+
 * Mon Aug 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-6
 - glusterfs-cli RPM to simplify dependencies for vdsm