diff --git a/dlm.spec b/dlm.spec index 1505ea3..6a76022 100644 --- a/dlm.spec +++ b/dlm.spec @@ -1,6 +1,6 @@ Name: dlm Version: 3.99.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ # For a breakdown of the licensing, see README.license Group: System Environment/Kernel @@ -12,6 +12,7 @@ BuildRequires: pacemaker-libs-devel >= 1.1.7 BuildRequires: libxml2-devel BuildRequires: systemd-units Source0: http://people.redhat.com/teigland/%{name}-%{version}.tar.gz +Patch0: dlm_stonith-link-with-ldl.patch Requires: %{name}-lib = %{version}-%{release} Requires: corosync >= 1.99.7 @@ -25,6 +26,7 @@ The kernel dlm requires a user daemon to control cluster membership. %prep %setup -q +%patch0 -p1 %build # upstream does not require configure @@ -101,6 +103,9 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 21 2012 David Teigland - 3.99.1-3 +- Fix dlm_stonith linking + * Wed Mar 21 2012 David Teigland - 3.99.1-2 - Require pacemaker-libs-devel to build dlm_stonith diff --git a/dlm_stonith-link-with-ldl.patch b/dlm_stonith-link-with-ldl.patch new file mode 100644 index 0000000..283af48 --- /dev/null +++ b/dlm_stonith-link-with-ldl.patch @@ -0,0 +1,25 @@ +From 470688a483678f01341f45815d7376b9002d2ebb Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Wed, 21 Mar 2012 16:09:01 -0500 +Subject: [PATCH] dlm_stonith: link with -ldl + +Signed-off-by: David Teigland +--- + fence/Makefile | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/fence/Makefile b/fence/Makefile +index c6ff2c0..41af463 100644 +--- a/fence/Makefile ++++ b/fence/Makefile +@@ -35,6 +35,7 @@ BIN_CFLAGS += -I../include + + BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie + BIN_LDFLAGS += `xml2-config --libs` ++BIN_LDFLAGS += -ldl + + all: $(BIN_TARGET) + +-- +1.7.6.5 +