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

3.4.0-6, glusterfs-cli for vdsm simplified dependencies

glusterfs.spec

@@ -39,7 +39,7 @@
 %{?_without_bd:%global _without_bd --disable-bd-xlator}
 
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
-%define _without_bd true
+%define _without_bd --disable-bd-xlator
 %endif
 
 # if you wish to build rpms without UFO, compile like this
@@ -66,7 +66,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.0
-Release:          5%{?prereltag:.%{prereltag}}%{?dist}
+Release:          6%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -267,6 +267,22 @@ is in user space and easily manageable.
 
 This package provides the base GlusterFS libraries
 
+%package cli
+Summary:          GlusterFS CLI
+Group:            Applications/File
+Requires:         %{name}-libs = %{version}-%{release}
+
+%description cli
+GlusterFS is a clustered file-system capable of scaling to several
+petabytes. It aggregates various storage bricks over Infiniband RDMA
+or TCP/IP interconnect into one large parallel network file
+system. GlusterFS is one of the most sophisticated file systems in
+terms of features and extensibility.  It borrows a powerful concept
+called Translators from GNU Hurd kernel. Much of the code in GlusterFS
+is in user space and easily manageable.
+
+This package provides the GlusterFS CLI application and its man page
+
 %if ( 0%{!?_without_rdma:1} )
 %package rdma
 Summary:          GlusterFS rdma support for ib-verbs
@@ -329,7 +345,6 @@ This package provides support to FUSE based clients.
 
 %package server
 Summary:          Clustered file-system server
-License:          GPLv2 or LGPLv3+
 Group:            System Environment/Daemons
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-libs = %{version}-%{release}
@@ -353,7 +368,6 @@ This package provides the glusterfs server daemon.
 
 %package api
 Summary:          Clustered file-system api library
-License:          GPLv2 or LGPLv3+
 Group:            System Environment/Daemons
 Requires:         %{name} = %{version}-%{release}
 
@@ -403,7 +417,6 @@ like Pacemaker.
 
 %package devel
 Summary:          Development Libraries
-License:          GPLv2 or LGPLv3+
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 
@@ -420,7 +433,6 @@ This package provides the development libraries and include files.
 
 %package api-devel
 Summary:          Development Libraries
-License:          GPLv2 or LGPLv3+
 Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 
@@ -921,6 +933,7 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
 %{_libdir}/glusterfs
 %{_sbindir}/glusterfs*
 %{_mandir}/man8/*gluster*.8*
+%exclude %{_mandir}/man8/gluster.8*
 %dir %{_localstatedir}/log/glusterfs
 %dir %{_localstatedir}/run/gluster
 %dir %{_sharedstatedir}/glusterd
@@ -950,6 +963,10 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
 %{_libdir}/*.so.*
 %exclude %{_libdir}/libgfapi.*
 
+%files cli
+%{_sbindir}/gluster
+%{_mandir}/man8/gluster.8*
+
 %if ( 0%{!?_without_rdma:1} )
 %files rdma
 %defattr(-,root,root,-)
@@ -1006,7 +1023,6 @@ fi
 %_init_glusterfsd
 %endif
 # binaries
-%{_sbindir}/gluster
 %{_sbindir}/glusterd
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
@@ -1479,6 +1495,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-6
+- glusterfs-cli RPM to simplify dependencies for vdsm
+
 * Mon Aug 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-5
 - there is no systemtap/dtrace support; don't even pretend