[dlm: 4/4] Merge back from F17

[Fabio M. Di Nitto]

commit 74cba63d6bc94317155ef5bd83e0e50c1ee64d3a
Merge: bfd3627 33e57f0
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Thu Mar 29 06:48:06 2012 +0200

    Merge back from F17
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

 .gitignore                      |    1 +
 dlm.spec                        |   26 ++-
 dlm_stonith-link-with-ldl.patch |   25 +++
 sources                         |    2 +-
 upstream_head_2ad89c869.patch   |  400 ---------------------------------------
 5 files changed, 48 insertions(+), 406 deletions(-)
---
diff --cc dlm.spec
index 083e7d1,6a76022..a972875
--- a/dlm.spec
+++ b/dlm.spec
@@@ -1,20 -1,21 +1,21 @@@
  Name:           dlm
- Version:        3.99.0
- Release:        8%{?dist}
+ Version:        3.99.1
 -Release:        3%{?dist}
++Release:        4%{?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.8
 -BuildRequires:  corosynclib-devel >= 1.99.7
++BuildRequires:  corosynclib-devel >= 1.99.9
+ BuildRequires:  pacemaker-libs-devel >= 1.1.7
  BuildRequires:  libxml2-devel
  BuildRequires:  systemd-units
  Source0:	http://people.redhat.com/teigland/%{name}-%{version}.tar.gz
- Patch0:		upstream_head_2ad89c869.patch
+ Patch0:		dlm_stonith-link-with-ldl.patch
  
  Requires:       %{name}-lib = %{version}-%{release}
- Requires:       corosync >= 1.99.8
 -Requires:       corosync >= 1.99.7
++Requires:       corosync >= 1.99.9
  Requires(post): systemd-units
  Requires(preun): systemd-units
  Requires(postun): systemd-units
@@@ -99,9 -103,15 +103,21 @@@ developing applications that use %{name
  %{_libdir}/pkgconfig/*.pc
  
  %changelog
++* Thu Mar 29 2012 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.99.1-4
++- Merge back from F17
++
+ * Wed Mar 21 2012 David Teigland <teigland at redhat.com> - 3.99.1-3
+ - Fix dlm_stonith linking
+ 
+ * Wed Mar 21 2012 David Teigland <teigland at redhat.com> - 3.99.1-2
+ - Require pacemaker-libs-devel to build dlm_stonith
+ 
+ * Wed Mar 21 2012 David Teigland <teigland at redhat.com> - 3.99.1-1
+ - Update to 3.99.1
+ 
 +* Fri Mar 16 2012 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.99.0-8
 +- Rebuild against new corosync (soname change).
 +
  * 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