SPECS: lvm2.spec - updated to 2.02.07 - clvmd builds again, added ...

[qboosh]

Author: qboosh                       Date: Wed Jul 19 18:50:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.02.07
- clvmd builds again, added cman bcond

---- Files affected:
SPECS:
   lvm2.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: SPECS/lvm2.spec
diff -u SPECS/lvm2.spec:1.69 SPECS/lvm2.spec:1.70
--- SPECS/lvm2.spec:1.69	Mon Jul 17 20:15:52 2006
+++ SPECS/lvm2.spec	Wed Jul 19 20:49:59 2006
@@ -1,24 +1,26 @@
 # $Revision$, $Date$
+#
 # Conditional build:
 %bcond_without	initrd	# don't build initrd version
 %bcond_without	uClibc	# link initrd version with static glibc instead of uClibc
-%bcond_with	clvmd	# build clvmd
+%bcond_without	clvmd	# build clvmd
+%bcond_with	cman	# use cman+dlm instead of gulm+ccs
 %bcond_without	selinux	# disable SELinux
 #
 %ifarch sparc64 sparc
 %undefine	with_uClibc
 %endif
 #
-%define	devmapper_ver	1.02.07
+%define	devmapper_ver	1.02.08
 Summary:	The new version of Logical Volume Manager for Linux
 Summary(pl):	Nowa wersja Logical Volume Managera dla Linuksa
 Name:		lvm2
-Version:	2.02.06
-Release:	0.5
+Version:	2.02.07
+Release:	0.1
 License:	GPL
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5:	35c232e771812700e0ca7225da1431b8
+# Source0-md5:	b00b47a4c4554792a7edb241b01fa1c6
 URL:		http://sources.redhat.com/lvm2/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -39,14 +41,24 @@
 	%endif
 %endif
 %if %{with clvmd}
-BuildRequires:	ccs-devel
+%if %{with cman}
+BuildRequires:	cman-devel >= 1.0
 BuildRequires:	dlm-devel >= 1.0-0.pre21.2
+%else
+BuildRequires:	ccs-devel >= 1.0
 BuildRequires:	gulm-devel >= 1.0-0.pre26.2
 %endif
+%endif
 BuildRequires:	readline-devel
 Requires:	device-mapper
+%if %{with clvmd}
+%if %{with cman}
+Requires:	cman >= 1.0
 Requires:	dlm >= 1.0-0.pre21.2
-%{?with_clvmd:Requires:	gulm >= 1.0-0.pre26.2}
+%else
+Requires:	gulm >= 1.0-0.pre26.2
+%endif
+%endif
 %{?with_selinux:Requires:	libselinux >= 1.10}
 Obsoletes:	lvm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -108,7 +120,7 @@
 	CFLAGS="%{rpmcflags}" \
 	--enable-readline \
 	--enable-fsadm \
-	%{?with_clvmd:--with-clvmd=gulm} \
+	%{?with_clvmd:--with-clvmd=%{?with_cman:cman}%{!?with_cman:gulm}} \
 	--with-lvm1=internal \
 	--with-pool=internal \
 	--with-cluster=internal \
@@ -154,6 +166,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2006/07/19 18:49:59  qboosh
+- updated to 2.02.07
+- clvmd builds again, added cman bcond
+
 Revision 1.69  2006/07/17 18:15:52  sparky
 - organised with initrd, uClibc-static >= 2:0.9.29 for ppc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lvm2.spec?r1=1.69&r2=1.70&f=u