[glusterfs] 3.3.0-2 selected fixes to spec for BZs 826836, 826855, 829734, 834847

[Kaleb S. KEITHLEY]

commit 09fdc2baeb3a76b1171bfd6943525c93af7b6855
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jul 5 15:46:05 2012 -0400

    3.3.0-2 selected fixes to spec for BZs 826836, 826855, 829734, 834847

 glusterfs.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 914cf24..bd373db 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -79,11 +79,13 @@ BuildRequires: python-ctypes
 
 Obsoletes:        hekafs <= 0.7
 Obsoletes:        %{name}-libs <= 2.0.0
-Obsoletes:        %{name}-common < 3.1.0
+Obsoletes:        %{name}-common < %{version}-%{release}
+Obsoletes:        %{name}-core < %{version}-%{release}
 Provides:         %{name}-libs = %{version}-%{release}
 Provides:         %{name}-common = %{version}-%{release}
 Provides:         %{name}-core = %{version}-%{release}
 
+
 %description
 GlusterFS is a clustered file-system capable of scaling to several
 petabytes. It aggregates various storage bricks over Infiniband RDMA
@@ -144,7 +146,7 @@ BuildRequires: fuse-devel
 
 Requires: %{name} = %{version}-%{release}
 
-Obsoletes:        %{name}-client < 3.1.0
+Obsoletes:        %{name}-client < %{version}-%{release}
 Provides:         %{name}-client = %{version}-%{release}
 
 %description fuse
@@ -449,14 +451,19 @@ if [ -d /var/lib/glusterd/vols ]; then
     done
 fi
 
-#add marker translator
+# add marker translator
+# but first make certain that there are no old libs around to bite us
+# BZ 834847
+if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
+    rm -f /etc/ld.so.conf.d/glusterfs.conf 
+    /sbin/ldconfig
+fi
 pidof -c -o %PPID -x glusterd &> /dev/null
 if [ $? -eq 0 ]; then
     kill -9 `pgrep -f gsyncd.py` &> /dev/null
 
     killall glusterd &> /dev/null
     glusterd --xlator-option *.upgrade=on -N
-    glusterd
 else
     glusterd --xlator-option *.upgrade=on -N
 fi
@@ -475,7 +482,7 @@ fi
 
 %changelog
 * Thu Jul 5 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-2
-- selected fixes to glusterfs.spec from BZs 826836, 826855, 829734, 834847
+- selected fixes to glusterfs.spec for BZs 826836, 826855, 829734, 834847
 
 * Thu May 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-1
 - Update to 3.3.0