From d5e095c33965a3caa2af5109659d629162f78bd8 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Fri, 20 Oct 2006 21:15:26 +0000
Subject: [PATCH] - Remove no-longer-used ldconfig from lvm2-cluster and fix
 lvmconf to cope     without the shared library.

---
 cluster-locking-built-in.patch | 88 ++++++++++++++++++++++++++++++++--
 lvm2.spec                      | 11 ++---
 2 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/cluster-locking-built-in.patch b/cluster-locking-built-in.patch
index 53dce9e..52fb823 100644
--- a/cluster-locking-built-in.patch
+++ b/cluster-locking-built-in.patch
@@ -1,5 +1,5 @@
---- LVM2.2.02.11-old/scripts/lvmconf.sh	2006-09-20 18:36:47.000000000 +0100
-+++ LVM2.2.02.11/scripts/lvmconf.sh	2006-10-14 16:57:06.000000000 +0100
+--- LVM2.2.02.12-old/scripts/lvmconf.sh	2006-09-20 18:36:47.000000000 +0100
++++ LVM2.2.02.12/scripts/lvmconf.sh	2006-10-20 19:20:26.000000000 +0100
 @@ -36,7 +36,7 @@ function parse_args
      while [ -n "$1" ]; do
          case $1 in
@@ -9,12 +9,92 @@
                  shift
                  ;;
              --disable-cluster)
-@@ -170,7 +170,7 @@ then
+@@ -94,15 +94,13 @@ function validate_args
+ 
+     if [ -n "$LOCKINGLIBDIR" ]; then
+ 
+-        [ -z "$LOCKINGLIB" ] && LOCKINGLIB="liblvm2clusterlock.so"
+-            
+         if [ "${LOCKINGLIBDIR:0:1}" != "/" ]
+             then
+             echo "Prefix must be an absolute path name (starting with a /)"
+             exit 12
+         fi
+     
+-        if [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
++        if [ -n "$LOCKINGLIB" ] && [ ! -f "$LOCKINGLIBDIR/$LOCKINGLIB" ]
+             then
+             echo "$LOCKINGLIBDIR/$LOCKINGLIB does not exist, did you do a \"make install\" ?"
+             exit 11
+@@ -170,13 +168,29 @@ then
      if [ -z "$LOCKING_TYPE" ]; then
  	LOCKING_TYPE=1
      fi
 -    if [ "$LOCKING_TYPE" = "2" ]; then
-+    if [ "$LOCKING_TYPE" = "3" ]; then
++    if [ "$LOCKING_TYPE" = "3" ] || [ "$LOCKING_TYPE" = "2" ]; then
          cat $CONFIGFILE - <<EOF > $TMPFILE
  global {
      # Enable locking for cluster LVM
+     locking_type = $LOCKING_TYPE
+     library_dir = "$LOCKINGLIBDIR"
++EOF
++        if [ $? != 0 ]
++        then
++    	    echo "failed to create temporary config file, $CONFIGFILE not updated"
++	    exit 14
++        fi
++	if [ -n "$LOCKINGLIB" ]; then
++	    cat - <<EOF >> $TMPFILE
+     locking_library = "$LOCKINGLIB"
++EOF
++            if [ $? != 0 ]
++            then
++	        echo "failed to create temporary config file, $CONFIGFILE not updated"
++	        exit 16
++            fi
++	fi
++	cat - <<EOF >> $TMPFILE
+ }
+ EOF
+     fi # if we aren't setting cluster locking, we don't need to create a global section
+@@ -184,7 +198,7 @@ EOF
+     if [ $? != 0 ]
+     then
+ 	echo "failed to create temporary config file, $CONFIGFILE not updated"
+-	exit 14
++	exit 17
+     fi
+ else
+     #
+@@ -208,8 +222,10 @@ else
+         else
+             SEDCMD="${SEDCMD}\n/global[[:blank:]]*{/a\ \ \ \ library_dir = \"$LOCKINGLIBDIR\""
+         fi
++    fi
+ 
+-        if [ "$have_library" = "0" ] 
++    if [ -n "$LOCKINGLIB" ]; then
++        if [ "$have_library" = "0" ]
+             then
+             SEDCMD="${SEDCMD}\ns/^[[:blank:]]*locking_library[[:blank:]]*=.*/\ \ \ \ locking_library = \"$LOCKINGLIB\"/g"
+         else
+@@ -217,19 +233,6 @@ else
+         fi
+     fi
+ 
+-    if [ "$LOCKING_TYPE" = "1" ]; then
+-        # if we're not using cluster locking, remove the library dir and locking library name
+-        if [ "$have_dir" = "0" ] 
+-            then
+-            SEDCMD="${SEDCMD}\n/^[[:blank:]]*library_dir[[:blank:]]*=.*/d"
+-        fi
+-
+-        if [ "$have_library" = "0" ] 
+-            then
+-            SEDCMD="${SEDCMD}\n/^[[:blank:]]*locking_library[[:blank:]]*=.*/d"
+-        fi
+-    fi
+-
+     echo -e $SEDCMD > $SCRIPTFILE
+     sed  <$CONFIGFILE >$TMPFILE -f $SCRIPTFILE
+     if [ $? != 0 ]
diff --git a/lvm2.spec b/lvm2.spec
index a7c2d06..6cbd3c8 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -3,7 +3,7 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -89,23 +89,18 @@ Summary: Cluster extensions for userland logical volume management tools
 Group: System Environment/Base
 Requires: lvm2 = %{version}-%{release}
 Requires(post): chkconfig
-Requires(post): ldconfig
 Requires(preun): chkconfig
 Requires(preun): device-mapper >= %{device_mapper_version}
 Requires(preun): lvm2 >= 2.02
-Requires(postun): ldconfig
 
 %description cluster
 Extensions to LVM2 to support clusters.
 
 %post cluster
 /sbin/chkconfig --add clvmd
-/sbin/ldconfig
 
 /usr/sbin/lvmconf --lockinglibdir %{_libdir}
 
-%postun cluster -p /sbin/ldconfig
-
 %preun cluster
 if [ "$1" = 0 ]; then
         /sbin/chkconfig --del clvmd
@@ -121,6 +116,10 @@ fi
 
 
 %changelog
+* Fri Oct 20 2006 Alasdair Kergon <agk@redhat.com> - 2.02.12-2
+- Remove no-longer-used ldconfig from lvm2-cluster and fix lvmconf
+  to cope without the shared library.
+
 * Mon Oct 16 2006 Alasdair Kergon <agk@redhat.com> - 2.02.12-1
 - New upstream.