rpms/lvm2/devel clvmd-init-chkconfig.patch, NONE, 1.1 lvm2.spec, 1.80, 1.81

[fedora-cvs-commits at redhat.com]

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16009

Modified Files:
	lvm2.spec 
Added Files:
	clvmd-init-chkconfig.patch 
Log Message:
attempt to incorporate lvm2-cluster as a subpackage


clvmd-init-chkconfig.patch:
 clvmd_init_fedora |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE clvmd-init-chkconfig.patch ---
--- LVM2.2.01.09/scripts/clvmd_init_rhel4	2005-05-23 18:43:23.000000000 +0100
+++ LVM2.2.01.09/scripts/clvmd_init_fedora	2005-05-23 18:44:18.000000000 +0100
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 345 24 76
+# chkconfig: - 24 76
 # description: Starts and stops clvmd
 #
 #	       


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- lvm2.spec	14 Oct 2006 17:04:26 -0000	1.80
+++ lvm2.spec	14 Oct 2006 18:28:02 -0000	1.81
@@ -1,19 +1,23 @@
+%define device-mapper-version 1.02.12
+
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
-Patch0: cluster-locking-built-in.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.11
+Patch0: clvmd-init-chkconfig.patch
+Patch1: cluster-locking-built-in.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: device-mapper >= %{device-mapper-version}
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
 BuildRequires: libtermcap-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-Requires: device-mapper >= 1.02.11
+BuildRequires: cman-devel
+Requires: device-mapper >= %{device-mapper-version}
 Conflicts: lvm
 Obsoletes: lvm
 
@@ -29,15 +33,17 @@
 
 %prep
 %setup -q -n LVM2.%{version}
-%patch -p1 -b .locking
+%patch -p1 -b .chkconfig
+%patch1 -p1 -b .locking
 
 %build
-%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=
+%configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=
 make DESTDIR=$RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+make install_cluster DESTDIR=$RPM_BUILD_ROOT
 ln -s lvm.static $RPM_BUILD_ROOT/sbin/lvm
 ln -s lvm.static $RPM_BUILD_ROOT/sbin/pvscan
 ln -s lvm.static $RPM_BUILD_ROOT/sbin/vgchange
@@ -47,6 +53,9 @@
 install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm
 install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/lvm/.cache
 install -m 0755 scripts/lvm_dump.sh $RPM_BUILD_ROOT/usr/sbin/lvmdump
+mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
+install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
+install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/usr/sbin/lvmconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,7 +77,49 @@
 /etc/lvm/archive
 /var/lock/lvm
 
+##############################################################################
+# Cluster subpackage
+##############################################################################
+%package cluster
+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
+        /usr/sbin/lvmconf --disable-cluster
+fi
+
+%files cluster
+%defattr(-,root,root,-)
+%attr(755,root,root) %{_sbindir}/clvmd
+%{_sbindir}/lvmconf
+%{_mandir}/man8/clvmd.8.gz
+/etc/rc.d/init.d/clvmd
+
+
 %changelog
+* Sat Oct 14 2006 Alasdair Kergon <agk at redhat.com> - 2.02.11-6
+- Incorporate lvm2-cluster as a subpackage.
+
 * Sat Oct 14 2006 Alasdair Kergon <agk at redhat.com> - 2.02.11-5
 - Install lvmdump script.