Author: jajcus Date: Sat Jun 30 19:22:12 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added 'without cman' bcond, so clvmd can be built with openais support and
no cman+dlm dependency
---- Files affected:
packages/lvm2:
lvm2.spec (1.201 -> 1.202)
---- Diffs:
================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.201 packages/lvm2/lvm2.spec:1.202
--- packages/lvm2/lvm2.spec:1.201 Sat Jun 2 17:59:14 2012
+++ packages/lvm2/lvm2.spec Sat Jun 30 21:22:07 2012
@@ -5,6 +5,9 @@
# /etc/rc.d/init.d/clvmd
# - --with-replicators (=internal/shared/none, default is none)?
# - OCF agents?
+# - corosync without openais?
+# - does the 'clvmd3' bcond make sense at all - it only changes build requires
+# and _disables_ clvmd.
#
# Conditional build:
%bcond_without initrd # don't build initrd version
@@ -13,6 +16,7 @@
%bcond_with glibc # link initrd version with static GLIBC
%bcond_without clvmd # don't build clvmd
%bcond_with clvmd3 # build clvmd for 3rd generation of cluster
+%bcond_without cman # don't use 'cman' for clvmd
%bcond_with openais # enable corosync&openais managers and cmirrord
%bcond_with lvmetad # enable lvmetad
%bcond_without selinux # disable SELinux
@@ -36,6 +40,11 @@
%define with_glibc 1
%endif
+%if %{without cman} && %{without openais}
+%undefine with_clvmd
+%undefine with_clvmd3
+%endif
+
%if %{with clvmd3}
%undefine with_clvmd
%endif
@@ -80,7 +89,7 @@
%{?with_glibc:BuildRequires: glibc-static}
%{?with_uClibc:BuildRequires: uClibc-static >= 2:0.9.29}
%endif
-%if %{with clvmd}
+%if %{with cman}
BuildRequires: cman-devel >= 1.0
BuildRequires: dlm-devel >= 1.0-0.pre21.2
%endif
@@ -94,7 +103,7 @@
%endif
Requires(post,preun,postun): systemd-units >= 38
Requires: device-mapper >= %{version}-%{release}
-%if %{with clvmd}
+%if %{with cman}
Requires: cman-libs >= 1.0
Requires: dlm >= 1.0-0.pre21.2
%endif
@@ -323,7 +332,14 @@
--enable-pkgconfig \
--enable-udev_sync \
--enable-udev_rules \
- %{?with_clvmd:--with-clvmd=cman%{?with_openais:,corosync,openais}} \
+%if %{with clvmd}
+%if %{with cman}
+ --with-clvmd=cman%{?with_openais:,corosync,openais} \
+%endif
+%if %{with openais}
+ --with-clvmd=corosync,openais \
+%endif
+%endif
--with-lvm1=internal \
--with-pool=internal \
--with-cluster=internal \
@@ -486,6 +502,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.202 2012/06/30 19:22:07 jajcus
+- added 'without cman' bcond, so clvmd can be built with openais support and
+ no cman+dlm dependency
+
Revision 1.201 2012/06/02 15:59:14 baggins
- rel 9
- ude_get_dev_path is deprecated and has been removed in udev 183
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/lvm2/lvm2.spec?r1=1.201&r2=1.202
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
