[dlm/f17] Update to 3.99.1

[David Teigland]

commit 4f6f60652470c557241aa2fda9f2b22c7978d9d8
Author: David Teigland <teigland at redhat.com>
Date:   Wed Mar 21 15:33:42 2012 -0500

    Update to 3.99.1

 .gitignore |    1 +
 dlm.spec   |   16 ++++++++++------
 sources    |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78a72b0..78b8251 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /dlm-3.99.0.tar.gz
+/dlm-3.99.1.tar.gz
diff --git a/dlm.spec b/dlm.spec
index 9dcb58a..e7aada0 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,20 +1,19 @@
 Name:           dlm
-Version:        3.99.0
-Release:        7%{?dist}
+Version:        3.99.1
+Release:        1%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
 Group:          System Environment/Kernel
 Summary:        Cluster control daemon and tool
 URL:            https://fedorahosted.org/cluster
 BuildRequires:  glibc-kernheaders
-BuildRequires:  corosynclib-devel >= 1.99.4
+BuildRequires:  corosynclib-devel >= 1.99.7
 BuildRequires:  libxml2-devel
 BuildRequires:  systemd-units
 Source0:	http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
-Patch0:		upstream_head_2ad89c869.patch
 
 Requires:       %{name}-lib = %{version}-%{release}
-Requires:       corosync >= 1.99.4
+Requires:       corosync >= 1.99.7
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -25,16 +24,17 @@ The kernel dlm requires a user daemon to control cluster membership.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # upstream does not require configure
 # upstream does not support _smp_mflags
 CFLAGS=$RPM_OPT_FLAGS make
+CFLAGS=$RPM_OPT_FLAGS make -C fence
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
+make -C fence install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
 
 install -Dm 0644 init/dlm.service %{buildroot}%{_unitdir}/dlm.service
 
@@ -61,6 +61,7 @@ fi
 %{_unitdir}/dlm.service
 %{_sbindir}/dlm_controld
 %{_sbindir}/dlm_tool
+%{_sbindir}/dlm_stonith
 %{_mandir}/man8/dlm*
 %{_mandir}/man3/*dlm*
 
@@ -99,6 +100,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Mar 21 2012 David Teigland <teigland at redhat.com> - 3.99.1-1
+- Update to 3.99.1
+
 * Thu Feb 16 2012 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.99.0-7
 - Update to upstream HEAD 2ad89c869git.
 - Bump BuildRequires and Requires to new corosync
diff --git a/sources b/sources
index 2dda8aa..fcd4eec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cd371abe5d977b386796d8d0b9066d0  dlm-3.99.0.tar.gz
+0acd0fe9d652f895485d04eb63bc7f02  dlm-3.99.1.tar.gz