[glusterfs/el5: 85/85] Merge remote-tracking branch 'origin/f17' into el5

[Kaleb S. KEITHLEY]

commit 56f64b9a9708fa006b47afdc65019859a4a136b8
Merge: b8ef94c b012c24
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jun 1 07:27:37 2012 -0400

    Merge remote-tracking branch 'origin/f17' into el5
    
    Conflicts:
    	.gitignore
    	glusterfs.spec
    	glusterfsd.init
    	glusterfsd.logrotate
    	glusterfsd.sysconfig
    	sources
    
    Jump from 2.0.9 to 3.3.0 on el5 branch. Intervening commits will have
    to be reconstructed from commits on other branches if you want to build
    the respective versions for el5.

 .gitignore                                  |   13 +
 glusterd.init                               |  109 ++++++
 glusterd.logrotate                          |    6 +
 glusterd.service                            |   13 +
 glusterd.sysconfig                          |    6 +
 glusterfs-3.2.5.configure.ac.patch          |   11 +
 glusterfs-3.2.5.libglusterfs.Makefile.patch |   23 ++
 glusterfs-3.3.0.libglusterfs.Makefile.patch |   24 ++
 glusterfs-fuse.logrotate                    |    6 +
 glusterfs.spec                              |  530 ++++++++++++++++++++-------
 glusterfsd.init                             |    2 +-
 glusterfsd.logrotate                        |    2 +-
 glusterfsd.service                          |   12 +
 glusterfsd.sysconfig                        |    2 -
 sources                                     |    2 +-
 15 files changed, 619 insertions(+), 142 deletions(-)
---
diff --cc .gitignore
index 5764ba0,2947e8a..ac6c5fd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,14 +1,14 @@@
  glusterfs-2.0.9.tar.gz
+ glusterfs-3.0.5.tar.gz
+ glusterfs-3.0.7.tar.gz
+ glusterfs-3.1.1.tar.gz
+ glusterfs-3.1.2.tar.gz
+ glusterfs-3.1.3.tar.gz
+ glusterfs-3.1.4.tar.gz
+ glusterfs-3.2.1.tar.gz
+ glusterfs-3.2.2.tar.gz
+ glusterfs-3.2.3.tar.gz
+ glusterfs-3.2.4.tar.gz
+ glusterfs-3.2.5.tar.gz
 -/glusterfs-3.2.6.tar.gz
 -/glusterfs-3.3.0.tar.gz
++glusterfs-3.2.6.tar.gz
++glusterfs-3.3.0.tar.gz
diff --cc glusterfs.spec
index f6c5251,240183c..c48c595
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -183,14 -289,100 +289,100 @@@ sed -i 's|option working-directory /etc
  %clean
  %{__rm} -rf %{buildroot}
  
+ %post
+ /sbin/ldconfig
  
- %post common -p /sbin/ldconfig
+ %postun
+ /sbin/ldconfig
  
- %postun common -p /sbin/ldconfig
+ %files
+ %defattr(-,root,root,-)
+ %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
+ %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
+ %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
+ %{_libdir}/glusterfs
+ %{_libdir}/*.so.*
+ %{_sbindir}/glusterfs*
+ %{_libexecdir}/glusterfs
 -#%{_mandir}/man8/*gluster*.8* # man page install commented out in 3.3.0 source
++# %{_mandir}/man8/*gluster*.8*
+ %dir %{_localstatedir}/log/glusterfs
+ %if 0%{!?_without_rdma:1}
+ %exclude %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
+ %endif
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/storage*
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/features/posix*
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/protocol/server*
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/mgmt*
+ %exclude %{_libdir}/glusterfs/%{version}/xlator/nfs*
+ 
+ 
+ %if 0%{!?_without_rdma:1}
+ %files rdma
+ %defattr(-,root,root,-)
+ %{_libdir}/glusterfs/%{version}/rpc-transport/rdma*
+ %endif
  
+ %if 0%{!?_without_georeplication:1}
+ %post geo-replication
+ #restart glusterd.
+ %{_sysconfdir}/init.d/glusterd restart &> /dev/null
+ %endif
+ 
+ %if 0%{!?_without_georeplication:1}
+ %files geo-replication
+ %defattr(-,root,root)
+ %{_libexecdir}/glusterfs/gsyncd
+ %{_libexecdir}/glusterfs/python/syncdaemon/*
+ %endif
+ 
+ %files fuse
+ %defattr(-,root,root,-)
+ %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse
+ %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
 -#%{_mandir}/man8/mount.glusterfs.8* # man page install commented out in 3.3.0 source
++# %{_mandir}/man8/mount.glusterfs.8*
+ /sbin/mount.glusterfs
+ /sbin/umount.glusterfs
+ %if 0%{?_with_fusermount:1}
+ %{_bindir}/fusermount-glusterfs
+ %endif
+ 
+ 
+ %files server
+ %defattr(-,root,root,-)
+ %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
+ %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
+ %config(noreplace) %{_sysconfdir}/glusterfs
+ # Legacy configs
+ %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
+ %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
+ %{_sharedstatedir}/glusterd
+ %_init_file1
+ %_init_file2
+ %{_sbindir}/gluster
+ %{_sbindir}/glusterd
+ %{_libdir}/glusterfs/%{version}/xlator/storage*
+ %{_libdir}/glusterfs/%{version}/xlator/features/posix*
+ %{_libdir}/glusterfs/%{version}/xlator/protocol/server*
+ %{_libdir}/glusterfs/%{version}/xlator/mgmt*
+ %{_libdir}/glusterfs/%{version}/xlator/nfs*
+ 
+ 
+ %files vim
+ %defattr(-,root,root,-)
+ %doc COPYING-GPLV2 COPYING-LGPLV3
+ %{_datadir}/vim/vimfiles/syntax/glusterfs.vim
+ 
+ %files devel
+ %defattr(-,root,root,-)
+ %{_includedir}/glusterfs
+ %exclude %{_includedir}/glusterfs/y.tab.h
+ %{_libdir}/*.so
  
  %post server
- /sbin/chkconfig --add glusterfsd
+ # Legacy server
+ %_init_enable glusterd
+ %_init_enable glusterfsd
  
  %preun server
  if [ $1 -eq 0 ]; then
diff --cc glusterfsd.sysconfig
index f46cd7d,250983a..b87deb1
--- a/glusterfsd.sysconfig
+++ b/glusterfsd.sysconfig
@@@ -4,5 -4,4 +4,3 @@@
  #GLUSTERFSD_CONFIG="/etc/glusterfs/glusterfsd.vol"
  #GLUSTERFSD_LOGFILE="/var/log/glusterfs/glusterfs.log"
  #GLUSTERFSD_LOGLEVEL="NORMAL"
- #GLUSTERFSD_NOFILE="65536"
--