[fence-virt/f16] Rebase to fence-virt-0.3.0

Fri May 25 14:36:05 UTC 2012

commit b7a8c20c7648c7ecf65be15c15df8ee76f22cb6b
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Fri May 18 15:52:54 2012 -0400

    Rebase to fence-virt-0.3.0

 .gitignore      |    1 +
 fence-virt.spec |   98 ++++++++++++++++++++++++++++++++++++-------------------
 sources         |    2 +-
 3 files changed, 66 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 702e4f4..5c90a14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ fence-virt-0.2.tar.gz
 fence-virt-0.2.1.tar.gz
 /fence-virt-0.2.2.tar.gz
 /fence-virt-0.2.3.tar.gz
+/fence-virt-0.3.0.tar.gz
diff --git a/fence-virt.spec b/fence-virt.spec
index 5fcb42d..5c8b6ed 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -1,19 +1,28 @@
 Name:		fence-virt
-Version:	0.2.3
-Release:	2%{?dist}
+Version:	0.3.0
+Release:	1%{?dist}
 Summary:	A pluggable fencing framework for virtual machines
 Group:		System Environment/Base
 License:	GPLv2+
-URL:		http://voxel.dl.sourceforge.net/project/fence-virt/fence-virt-%{version}.tar.gz
-Source0:	%{name}-%{version}.tar.gz
+URL:		http://fence-virt.sourceforge.net
+Source0:	http://voxel.dl.sourceforge.net/project/fence-virt/%{name}-%{version}.tar.gz
+Patch0: qpid-build.patch
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:	corosynclib-devel clusterlib-devel libvirt-devel
-BuildRequires:	openaislib-devel qmf-devel qpid-cpp-client-devel
+BuildRequires:	corosynclib-devel libvirt-devel
+BuildRequires:	qmf-devel qpid-cpp-client-devel
 BuildRequires:	automake autoconf libxml2-devel nss-devel nspr-devel
 BuildRequires:	flex bison libuuid-devel
+
+BuildRequires: systemd-units
+Requires(post):	systemd-sysv systemd-units
+Requires(preun):	systemd-units
+Requires(postun):	systemd-units
+
 Conflicts:	fence-agents < 3.0.5-2
 
+
 %description
 Fencing agent for virtual machines.
 
@@ -60,34 +69,22 @@ 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
+%package -n fence-virtd-libvirt-qmf
+Summary:	Libvirt-qmf backend for fence-virtd
 Group:		System Environment/Base
 Requires:	libvirt >= 0.6.0
-Requires:	fence-virtd libvirt-qpid
+Requires:	fence-virtd libvirt-qmf
+Obsoletes:	fence-virtd-libvirt-qpid <= 0.2.3
 
-%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
+%description -n fence-virtd-libvirt-qmf
+Provides fence_virtd with a connection to libvirt-qmf to
+fence virtual machines.  Libvirt-qmf provies a QMFv2 model
 to track VMs across multiple hosts.
 
 
-%package -n fence-virtd-checkpoint
-Summary:	Cluster+Libvirt backend for fence-virtd
-Group:		System Environment/Base
-Requires:	fence-virtd
-
-%description -n fence-virtd-checkpoint
-Provides fence_virtd with a connection to libvirt to fence
-virtual machines.  Utilizes corosync's CPG framework to route
-requests as well as the AIS Checkpoint API to store virtual
-machine states across a cluster and make intelligent decisions
-about whether a virtual machine is running.
-
-
 %prep
 %setup -q
-
+%patch0 -p1 -b .qpid-build
 
 %build
 ./autogen.sh
@@ -98,9 +95,10 @@ 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
 
+# Systemd unit file
+mkdir -p %{buildroot}/%{_unitdir}/
+install -m 0644 fence_virtd.service %{buildroot}/%{_unitdir}/
 
 %clean
 rm -rf %{buildroot}
@@ -114,13 +112,44 @@ rm -rf %{buildroot}
 %{_mandir}/man8/fence_virt.*
 %{_mandir}/man8/fence_xvm.*
 
+
 %post
 ccs_update_schema > /dev/null 2>&1 ||:
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable fence_virtd.service &> /dev/null || :
+    /bin/systemctl stop fence_virtd.service &> /dev/null || :
+fi
+
+%postun
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
+/bin/systemctl daemon-reload &> /dev/null || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart fence_virtd.service &> /dev/null || :
+fi
+
+
+%triggerun -- fence_virtd < 0.3.0-1
+# https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Packages_migrating_to_a_systemd_unit_file_from_a_SysV_initscript
+/usr/bin/systemd-sysv-convert --save fence_virtd &> /dev/null || :
+/sbin/chkconfig --del fence_virtd &> /dev/null || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl try-restart fence_virtd.service &> /dev/null || :
+
 
 %files -n fence-virtd
 %defattr(-,root,root,-)
 %{_sbindir}/fence_virtd
-%{_sysconfdir}/rc.d/init.d/fence_virtd
+%{_unitdir}/fence_virtd.service
 %config(noreplace) %{_sysconfdir}/fence_virt.conf
 %dir %{_libdir}/%{name}
 %{_mandir}/man5/fence_virt.conf.*
@@ -138,15 +167,16 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libvirt.so
 
-%files -n fence-virtd-libvirt-qpid
+%files -n fence-virtd-libvirt-qmf
 %defattr(-,root,root,-)
-%{_libdir}/%{name}/libvirt-qpid.so
+%{_libdir}/%{name}/libvirt-qmf.so
 
-%files -n fence-virtd-checkpoint
-%defattr(-,root,root,-)
-%{_libdir}/%{name}/checkpoint.so
 
 %changelog
+* Fri May 18 2012 Ryan McCabe <rmccabe at fedoraproject.org> 0.3.0-1
+- Rebase from upstream to 0.3.0
+- Add QPid build fix patch from upstream.
+
 * Fri Jul  8 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.2.3-2
 - add post call to fence-virt to integrate with cluster 3.1.4
 
diff --git a/sources b/sources
index ae07c3d..fcb37c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84269c1caf97e9b2091bacda3596bd33  fence-virt-0.2.3.tar.gz
+36057fa04a5a9469b0883782862ea04e  fence-virt-0.3.0.tar.gz
