update to 3.2.7

Here's hoping that 3.2.7 is the last of of the 3.2.x line so I don't
have to branch and don't have to keep applying and reverting changes
for the 3.3.x line.

.gitignore

@@ -10,5 +10,6 @@ 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.2.7.tar.gz
+glusterfs-3.3.0.tar.gz

glusterfs.spec

@@ -24,20 +24,20 @@
 
 Summary:          Cluster File System
 Name:             glusterfs
-Version:          3.3.0
+Version:          3.2.7
 Release:          1%{?dist}
-License:          GPLv3+ and (GPLv2 or LGPLv3+)
+License:          GPLv3
 Group:            System Environment/Base
 Vendor:           Red Hat
 URL:              http://www.gluster.org//docs/index.php/GlusterFS
-Source0:          http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/glusterfs-%{version}.tar.gz
+Source0:          http://download.gluster.org/pub/gluster/glusterfs/3.2/%{version}/glusterfs-%{version}.tar.gz
 Source1:          glusterd.sysconfig
 Source2:          glusterfsd.sysconfig
 Source3:          umount.glusterfs
 Source4:          glusterfs-fuse.logrotate
 Source5:          glusterd.logrotate
 Source6:          glusterfsd.logrotate
-Patch0:           %{name}-3.3.0.libglusterfs.Makefile.patch
+Patch0:           %{name}-3.2.5.libglusterfs.Makefile.patch
 Patch1:           %{name}-3.2.5.configure.ac.patch
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -74,10 +74,9 @@ Requires(postun): systemd-units
 BuildRequires: bison flex
 BuildRequires: gcc make automake libtool
 BuildRequires: ncurses-devel readline-devel
-BuildRequires: libxml2-devel openssl-devel
+BuildRequires: libxml2-devel
 BuildRequires: python-ctypes
 
-Obsoletes:        hekafs <= 0.7
 Obsoletes:        %{name}-libs <= 2.0.0
 Obsoletes:        %{name}-common < 3.1.0
 Provides:         %{name}-libs = %{version}-%{release}
@@ -253,6 +252,11 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 # Remove installed docs, we include them ourselves as %%doc
 %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
 
+# Rename the samples, so we can include them as %%config
+for file in %{buildroot}%{_sysconfdir}/glusterfs/*.sample; do
+  %{__mv} ${file} `dirname ${file}`/`basename ${file} .sample`
+done
+
 # Create working directory
 %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd
 
@@ -260,6 +264,10 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sharedstatedir}/glusterd|g' \
     %{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol
 
+# Clean up the examples we want to include as %%doc
+%{__cp} -a doc/examples examples
+%{__rm} -f examples/Makefile*
+
 # Install init script and sysconfig file
 %_init_install %{SOURCE7} glusterd
 %_init_install %{SOURCE8} glusterfsd
@@ -297,25 +305,21 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
+%doc ChangeLog COPYING INSTALL README THANKS
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %{_libdir}/glusterfs
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs*
+%{_sbindir}/gluster
+%{_sbindir}/glusterd
 %{_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
@@ -340,7 +344,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %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}
@@ -350,6 +354,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 
 %files server
 %defattr(-,root,root,-)
+%doc examples/ doc/glusterfs*.vol.sample
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %config(noreplace) %{_sysconfdir}/glusterfs
@@ -359,18 +364,10 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %{_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
+%doc COPYING
 %{_datadir}/vim/vimfiles/syntax/glusterfs.vim
 
 %files devel
@@ -397,6 +394,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Mon Jun 11 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.2.7-1
+- Update to 3.2.7
+
 * Thu May 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-1
 - Update to 3.3.0
 

sources

@@ -1 +1 @@
-3ddf782421f54c60b9da9607b0c32ec1  glusterfs-3.3.0.tar.gz
+74c36a0dac00e25d1b0b21100b04a281  glusterfs-3.2.7.tar.gz