[Cluster-devel] conga ./clustermon.spec.in.in ricci/modules/cl ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-03-31 17:23:45

Modified files:
	.              : clustermon.spec.in.in 
	ricci/modules/cluster: Virt.cpp 

Log message:
	Jerk the vm_list feature for the time being

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.35&r2=1.18.2.36
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Virt.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.5&r2=1.1.2.6

--- conga/clustermon.spec.in.in	2008/03/28 01:15:16	1.18.2.35
+++ conga/clustermon.spec.in.in	2008/03/31 17:23:45	1.18.2.36
@@ -30,7 +30,7 @@
 %define virt_support 0
 
 %ifarch i386 x86_64 ia64
-%define virt_support 1
+%define virt_support 0
 %endif
 
 BuildRequires: cman-devel
@@ -40,7 +40,8 @@
 
 %if %{virt_support}
 BuildRequires: libvirt-devel
-%endif 
+Requires: libvirt
+%endif
 
 %description
 This package contains Red Hat Enterprise Linux Cluster Suite
@@ -55,7 +56,7 @@
 %configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
-		--include_zope_and_plone=no --VIRT_SUPPORT=1
+		--include_zope_and_plone=no --VIRT_SUPPORT=0
 %else
 %configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
@@ -313,5 +314,5 @@
 - Don't auto-start modclusterd after installation, do it manually
 
 * Wed Aug 09 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-11
-- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and 
+- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and
   cluster-cim) from conga.srpm
--- conga/ricci/modules/cluster/Virt.cpp	2008/03/24 18:13:58	1.1.2.5
+++ conga/ricci/modules/cluster/Virt.cpp	2008/03/31 17:23:45	1.1.2.6
@@ -261,7 +261,7 @@
 #else
 map<String, String> Virt::get_vm_list(const String &hvURI) {
 	std::map<String, String> vm_list;
-	throw String("Not implemented on this architecture");
+	throw String("Not implemented currently.");
 	return vm_list;
 }
 #endif