New upstream release

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
This commit is contained in:
Fabio M. Di Nitto 2012-04-11 06:01:07 +02:00
parent 74cba63d6b
commit 37e7a15f14
4 changed files with 8 additions and 30 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/dlm-3.99.0.tar.gz
/dlm-3.99.1.tar.gz
/dlm-3.99.2.tar.gz

View File

@ -1,6 +1,6 @@
Name: dlm
Version: 3.99.1
Release: 4%{?dist}
Version: 3.99.2
Release: 1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+
# For a breakdown of the licensing, see README.license
Group: System Environment/Kernel
@ -12,7 +12,6 @@ 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.9
@ -26,7 +25,6 @@ The kernel dlm requires a user daemon to control cluster membership.
%prep
%setup -q
%patch0 -p1
%build
# upstream does not require configure
@ -66,6 +64,7 @@ fi
%{_sbindir}/dlm_tool
%{_sbindir}/dlm_stonith
%{_mandir}/man8/dlm*
%{_mandir}/man5/dlm*
%{_mandir}/man3/*dlm*
%package lib
@ -103,6 +102,9 @@ developing applications that use %{name}.
%{_libdir}/pkgconfig/*.pc
%changelog
* Wed Apr 112012 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.99.2-1
- New upstream release
* Thu Mar 29 2012 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.99.1-4
- Merge back from F17

View File

@ -1,25 +0,0 @@
From 470688a483678f01341f45815d7376b9002d2ebb Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Wed, 21 Mar 2012 16:09:01 -0500
Subject: [PATCH] dlm_stonith: link with -ldl
Signed-off-by: David Teigland <teigland@redhat.com>
---
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

View File

@ -1 +1 @@
0acd0fe9d652f895485d04eb63bc7f02 dlm-3.99.1.tar.gz
b4c2a922b8813ef36e60ec75fc7e1e1b dlm-3.99.2.tar.gz