From 4ee46d95063f16eb94dda595d99b9e0d01fbea13 Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lon@fedoraproject.org>
Date: Jan 15 2010 02:05:47 +0000
Subject: Rebase fence-virt 0.2 for several new features


---

diff --git a/.cvsignore b/.cvsignore
index 9c4cb2c..62fe187 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 fence-virt-0.1.2.tar.gz
 fence-virt-0.1.3.tar.gz
+fence-virt-0.2.tar.gz
diff --git a/fence-virt.spec b/fence-virt.spec
index c37d0d0..213276c 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -1,5 +1,5 @@
 Name:		fence-virt
-Version:	0.1.3
+Version:	0.2
 Release:	1%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
@@ -11,7 +11,7 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	corosynclib-devel clusterlib-devel libvirt-devel
 BuildRequires:	openaislib-devel qmf-devel qpidc-devel
 BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
-BuildRequires:	flex bison
+BuildRequires:	flex bison libuuid-devel
 Conflicts:	fence-agents < 3.0.5-2
 
 %description
@@ -38,6 +38,16 @@ Requires:	fence-virtd
 Provides multicast listener capability for fence-virtd.
 
 
+%package -n fence-virtd-serial
+Summary:	Serial VMChannel listener for fence-virtd
+Group:		System Environment/Base
+Requires:	libvirt > 0.6.2
+Requires:	fence-virtd
+
+%description -n fence-virtd-serial
+Provides serial VMChannel listener capability for fence-virtd.
+
+
 %package -n fence-virtd-libvirt
 Summary:	Libvirt backend for fence-virtd
 Group:		System Environment/Base
@@ -50,8 +60,20 @@ virtual machines.  Useful for running a cluster of virtual
 machines on a desktop.
 
 
+%package -n fence-virtd-libvirt-qpid
+Summary:	Libvirt-qpid backend for fence-virtd
+Group:		System Environment/Base
+Requires:	libvirt > 0.6.0
+Requires:	fence-virtd libvirt-qpid
+
+%description -n fence-virtd-libvirt-qpid
+Provides fence_virtd with a connection to libvirt-qpid to
+fence virtual machines.  Libvirt-qpid provies a QMF model
+to track VMs across multiple hosts.
+
+
 %package -n fence-virtd-checkpoint
-Summary:	Cluster+libvirt backend for fence-virtd
+Summary:	Cluster+Libvirt backend for fence-virtd
 Group:		System Environment/Base
 Requires:	fence-virtd
 
@@ -63,17 +85,6 @@ machine states across a cluster and make intelligent decisions
 about whether a virtual machine is running.
 
 
-%package -n fence-virtd-qpid
-Summary:	Libvirt-qpid backend for fence-virtd
-Group:		System Environment/Base
-Requires:	fence-virtd
-
-%description -n fence-virtd-qpid
-Provides fence_virtd with a connection to libvirt-qpid to fence
-virtual machines.  Allows fence_virtd to operate as a QMF console
-and uses QMF to route fencing requests. 
-
-
 %prep
 %setup -q
 
@@ -87,6 +98,8 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/init.d
+install -m 0755 fence_virtd.init %{buildroot}/%{_sysconfdir}/rc.d/init.d/fence_virtd
 
 
 %clean
@@ -98,34 +111,47 @@ rm -rf %{buildroot}
 %doc COPYING TODO README
 %{_sbindir}/fence_virt
 %{_sbindir}/fence_xvm
-%{_mandir}/man8/*
+%{_mandir}/man8/fence_virt.*
+%{_mandir}/man8/fence_xvm.*
 
 %files -n fence-virtd
 %defattr(-,root,root,-)
 %{_sbindir}/fence_virtd
+%{_sysconfdir}/rc.d/init.d/fence_virtd
 %config(noreplace) %{_sysconfdir}/fence_virt.conf
 %dir %{_libdir}/%{name}
-# TODO: init script to start fence_virtd
-# TODO: auto-config utility
+%{_mandir}/man5/fence_virt.conf.*
+%{_mandir}/man8/fence_virtd.*
 
 %files -n fence-virtd-multicast
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/multicast.so
 
-%files -n fence-virtd-libvirt
+%files -n fence-virtd-serial
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/libvirt.so
+%{_libdir}/%{name}/serial.so
 
-%files -n fence-virtd-checkpoint
+%files -n fence-virtd-libvirt
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/checkpoint.so
+%{_libdir}/%{name}/libvirt.so
 
-%files -n fence-virtd-qpid
+%files -n fence-virtd-libvirt-qpid
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libvirt-qpid.so
 
+%files -n fence-virtd-checkpoint
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/checkpoint.so
 
 %changelog
+* Thu Jan 14 2010 Lon Hohberger <lhh@redhat.com> 0.2-1
+- Update to latest upstream version
+- Serial & VMChannel listener support
+- Static permission map support
+- Man pages
+- Init script
+- Various bugfixes
+
 * Mon Sep 21 2009 Lon Hohberger <lhh@redhat.com> 0.1.3-1
 - Update to latest upstream version
 - Adds libvirt-qpid backend support
diff --git a/sources b/sources
index c33e7c3..4676ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db5e1c2211c04c7c8a7f1d3047bbe778  fence-virt-0.1.3.tar.gz
+9d1e61576c40bd66f3c6cd06e666e6c0  fence-virt-0.2.tar.gz