From 84b84bad0e91864a8cf5b912d8ce740ef650e28c Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Fri, 30 Sep 2011 13:35:43 -0400
Subject: [PATCH] glusterfs 3.2.4

---
 .gitignore     |  1 +
 glusterfs.spec | 16 +++++++---------
 sources        |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce9e3de..f3b3fb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ glusterfs-3.0.5.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
diff --git a/glusterfs.spec b/glusterfs.spec
index 5d76c3e..7bcdf04 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -8,7 +8,7 @@
 %endif
 
 Name:             glusterfs
-Version:          3.2.3
+Version:          3.2.4
 Release:          1%{?dist}
 Summary:          Clustered file-system
 
@@ -191,13 +191,8 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 find %{buildroot}%{_libdir} -name '*.a' -delete
 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
+# Remove what the `make install` did, %%doc will install later
+%{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs
 
 # Create working directory
 %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd
@@ -280,7 +275,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 
 %files server
 %defattr(-,root,root,-)
-%doc examples/ doc/glusterfs*.vol.sample
+%doc examples/{*.vol,README} doc/*.sample
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %config(noreplace) %{_sysconfdir}/glusterfs
@@ -332,6 +327,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Fri Sep 30 2011 Kaleb S. KEITHLEY <kkeithle@redhat.com> - 3.2.4-1
+- Update to 3.2.4 
+
 * Mon Aug 22 2011 Kaleb S. KEITHLEY <kkeithle@redhat.com> - 3.2.3-1
 - Update to 3.2.3 
 
diff --git a/sources b/sources
index 648b92d..a47d114 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc050ede6116e456baca65283cf53fc6  glusterfs-3.2.3.tar.gz
+1ec38e9c40b6a6ac80dd03e1c8bc1543  glusterfs-3.2.4.tar.gz