[glusterfs/el6: 40/41] Merge remote-tracking branch 'origin/master' into el6

[Kaleb S. KEITHLEY]

commit f8e70dcbdf7d4a506d50282bee094963abf81602
Merge: c6fd074 f78c057
Author: Kaleb KEITHLEY <kkeithle at f16node1.kkeithle.usersys.redhat.com>
Date:   Tue Nov 22 13:26:56 2011 -0500

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	glusterfs.spec
    	sources

 .gitignore         |    4 +
 glusterd.service   |   13 +++
 glusterfs.spec     |  230 +++++++++++++++++++++++++++++++++++----------------
 glusterfsd.service |   12 +++
 sources            |    2 +-
 5 files changed, 188 insertions(+), 73 deletions(-)
---
diff --cc glusterfs.spec
index b9a38b1,3e8acff..68ff7df
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -1,38 -1,47 +1,47 @@@
+ 
+ 
+ # if you wish to compile an rpm without rdma support, compile like this...
+ # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz --without rdma
  %{?_without_rdma:%global _without_rdma --disable-ibverbs}
- %{?_without_epoll:%global _without_epoll --disable-epoll}
- %{?_with_fusermount:%gobal _with_fusermount --enable-fusermount}
  
- # No RDMA Support on x390(x)
+ # No RDMA Support on s390(x)
  %ifarch s390 s390x
- %{?_without_rdma:%global _without_rdma --disable-ibverbs}
+ %global _without_rdma --disable-ibverbs
  %endif
  
+ # if you wish to compile an rpm without epoll...
+ # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz --without epoll
+ %{?_without_epoll:%global _without_epoll --disable-epoll}
+ 
+ # if you wish to compile an rpm with fusermount...
+ # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz --with fusermount
+ %{?_with_fusermount:%global _with_fusermount --enable-fusermount}
+ 
+ # if you wish to compile an rpm without geo-replication support, compile like this...
+ # rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz --without georeplication
+ %{?_without_georeplication:%global _without_georeplication --disable-geo-replication}
+ 
+ 
+ Summary:          Cluster File System
  Name:             glusterfs
- Version:          3.2.1
+ Version:          3.2.5
 -Release:          1%{?dist}
 +Release:          2%{?dist}
- Summary:          Clustered file-system
- 
+ License:          GPLv3
  Group:            System Environment/Base
- License:          AGPLv3
- URL:              http://www.gluster.org/
+ Vendor:           Red Hat
+ URL:              http://www.gluster.org//docs/index.php/GlusterFS
  Source0:          http://download.gluster.com/pub/gluster/glusterfs/3.2/%{version}/glusterfs-%{version}.tar.gz
- Source1:          glusterd.init
- Source2:          glusterd.sysconfig
+ Source1:          glusterd.sysconfig
+ Source2:          glusterfsd.sysconfig
  Source3:          umount.glusterfs
  Source4:          glusterfs-fuse.logrotate
  Source5:          glusterd.logrotate
- # Legacy server
- Source11:         glusterfsd.init
- Source12:         glusterfsd.sysconfig
- Source15:         glusterfsd.logrotate
+ Source6:          glusterfsd.logrotate
  BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
- BuildRequires:    bison
- BuildRequires:    flex
- BuildRequires:    gcc
- BuildRequires:    make
- BuildRequires:    ncurses-devel, readline-devel, python-ctypes
- 
 -%if 0%{?fedora} < 17
++%if ( 0%{?fedora} < 17 || 0%{?rhel} < 7 )
+ Source7:          glusterd.init
+ Source8:          glusterfsd.init
  Requires(post):   /sbin/chkconfig
  Requires(preun):  /sbin/service
  Requires(preun):  /sbin/chkconfig
@@@ -332,6 -389,32 +389,35 @@@ if [ $1 -ge 1 ]; the
  fi
  
  %changelog
++* Mon Nov 21 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-2
++- rhel/epel, init.d for <=6, native systemd for 7
++
+ * Thu Nov 17 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-1
+ - Update to 3.2.5
+ 
+ * Wed Nov 16 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-3
+ - revised init.d/systemd to minimize fedora < 17
+ - get closer to the official glusterfs spec, including...
+ - add geo-replication, which should have been there since 3.2
+ 
+ * Wed Nov 2 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-2
+ - Convert init.d to systemd for f17 and later
+ 
+ * Fri Sep 30 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.4-1
+ - Update to 3.2.4
+ 
+ * Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.3-1
+ - Update to 3.2.3 
+ 
+ * Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.2-1
+ - Update to 3.2.2 
+ 
+ * Fri Aug 19 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.2-0
+ - Update to 3.2.2
+ 
+ * Wed Jun 29 2011 Dan Horák <dan[at]danny.cz> - 3.2.1-3
+ - disable InfiniBand on s390(x) unconditionally
+ 
  * Thu Jun 16 2011 Jonathan Steffan <jsteffan at fedoraproject.org> - 3.2.1-2
  - Fix Source0 URL