[fence-virt/f17] Rebase from upstream to 0.3.0

[Lon Hohberger]

commit dc37542662a6f4a248cbaab61d3a249fb6e8f595
Author: Lon Hohberger <lhh at redhat.com>
Date:   Tue Feb 7 17:54:21 2012 -0500

    Rebase from upstream to 0.3.0
    
    - Systemd unit file integration
    - Pacemaker backend
    - Various fixes for startup
    - Rename libvirt-qpid to libvirt-qmf backend
    - Updated default configuration for easier deployment on
      Fedora systems
    
    Conflicts:
    
    	fence-virt.spec

 .gitignore      |    1 +
 fence-virt.spec |   85 ++++++++++++++++++++++++++++++++++++++++++-------------
 sources         |    2 +-
 3 files changed, 67 insertions(+), 21 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 e6641e3..fd98d8e 100644
--- a/fence-virt.spec
+++ b/fence-virt.spec
@@ -1,20 +1,26 @@
 Name:		fence-virt
-Version:	0.2.3
-Release:	7%{?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
+URL:		http://voxel.dl.sourceforge.net/project/fence-virt/%{name}-%{version}.tar.gz
 Source0:	%{name}-%{version}.tar.gz
+
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 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
 
-Patch0:		disable-cman.patch
 
 %description
 Fencing agent for virtual machines.
@@ -62,36 +68,35 @@ 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.
 
 
 %prep
 %setup -q
 
-%patch0 -p1
-
-
 %build
 ./autogen.sh
-%{configure} --disable-checkpoint-plugin
+%{configure}
 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}
@@ -105,13 +110,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.*
@@ -129,19 +165,28 @@ 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
 
 
 %changelog
+* Tue Feb 28 2012 Lon Hohberger <lhh at redhat.com> 0.3.0-1
+- Rebase from upstream to 0.3.0
+- Systemd unit file integration
+- Pacemaker backend
+- Various fixes for startup
+- Rename libvirt-qpid to libvirt-qmf backend
+- Updated default configuration for easier deployment on
+  Fedora systems
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.3-7
 - Rebuilt for c++ ABI breakage
 
 * Mon Feb 07 2012 Lon Hohberger <lhh at redhat.com> - 0.2.3-6
 - Bump and rebuild
 
-* Mon Feb 07 2012 Lon Hohberger <lhh at redhat.com> - 0.2.3-5
+* Tue Feb 07 2012 Lon Hohberger <lhh at redhat.com> - 0.2.3-5
 - Fixup changelog
 
 * Mon Feb 06 2012 Lon Hohberger <lhh at redhat.com> - 0.2.3-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