.dlm.metadata

@@ -1 +1 @@
-3655865fa215e6b50e6b82ba66cb13f2d8005f67 SOURCES/dlm-4.0.9.tar.gz
+821112426f474123d090c570153d67468c4e0c11 SOURCES/dlm-4.1.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dlm-4.0.9.tar.gz
+SOURCES/dlm-4.1.0.tar.gz

SOURCES/0001-stonith_helper-fix-build.patch

@@ -1,39 +0,0 @@
-From 5afd9fdc0ef202633f57abc063a5a2c6cef1d61d Mon Sep 17 00:00:00 2001
-From: David Teigland <teigland@redhat.com>
-Date: Wed, 28 Jul 2021 16:12:43 -0500
-Subject: [PATCH] stonith_helper: fix build
-
-include stdlib
-use pkg-config to get pacemaker headers
----
- fence/Makefile         | 1 +
- fence/stonith_helper.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/fence/Makefile b/fence/Makefile
-index b927879eb141..1f6dd6b2c40e 100644
---- a/fence/Makefile
-+++ b/fence/Makefile
-@@ -20,6 +20,7 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \
- CFLAGS += -fPIE -DPIE
- CFLAGS += `xml2-config --cflags`
- CFLAGS += -I../include
-+CFLAGS += $(shell pkg-config --cflags pacemaker-fencing)
- 
- LDFLAGS += -Wl,-z,relro -pie
- LDFLAGS += `xml2-config --libs`
-diff --git a/fence/stonith_helper.c b/fence/stonith_helper.c
-index 3a0768af2830..b1db352ae04f 100644
---- a/fence/stonith_helper.c
-+++ b/fence/stonith_helper.c
-@@ -8,6 +8,7 @@
- 
- #include <stdio.h>
- #include <stdint.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <syslog.h>
--- 
-2.7.5
-

SPECS/dlm.spec

@@ -1,21 +1,20 @@
 Name:           dlm
-Version:        4.0.9
-Release:        7%{?dist}
+Version:        4.1.0
+Release:        1%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
-Summary:        Kernel Distributed Lock Manager control daemon and tool
-URL:            https://fedorahosted.org/cluster
-BuildRequires:  gcc
+Group:          System Environment/Kernel
+Summary:        dlm control daemon and tool
+URL:            https://pagure.io/dlm
 BuildRequires:  glibc-kernheaders
 BuildRequires:  corosynclib-devel >= 1.99.9
 BuildRequires:  pacemaker-libs-devel >= 1.1.7
 BuildRequires:  libxml2-devel
 BuildRequires:  systemd-units
 BuildRequires:  systemd-devel
-BuildRequires: make
 Source0:	https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
 
-Patch0: 0001-stonith_helper-fix-build.patch
+# Patch0: 0001-foo.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 ExclusiveArch: i686 x86_64
@@ -34,13 +33,13 @@ The kernel dlm requires a user daemon to control membership.
 
 %prep
 %setup -q
-%patch0 -p1 -b .0001-stonith_helper-fix-build.patch
+# %patch0 -p1 -b .0001-foo.patch
 
 %build
 # upstream does not require configure
 # upstream does not support _smp_mflags
-CFLAGS=$RPM_OPT_FLAGS make
-CFLAGS=$RPM_OPT_FLAGS make -C fence
+CFLAGS+=$RPM_OPT_FLAGS make
+CFLAGS+=$RPM_OPT_FLAGS make -C fence
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +59,7 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
 %systemd_postun_with_restart dlm.service
 
 %files
+%defattr(-,root,root,-)
 %doc README.license
 %{_unitdir}/dlm.service
 %{_sbindir}/dlm_controld
@@ -72,20 +72,25 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
 
 %package        lib
 Summary:        Library for %{name}
+Group:          System Environment/Libraries
 Conflicts:      clusterlib
 
 %description    lib
 The %{name}-lib package contains the libraries needed to use the dlm
 from userland applications.
 
-%ldconfig_scriptlets lib
+%post lib -p /sbin/ldconfig
+
+%postun lib -p /sbin/ldconfig
 
 %files          lib
-/usr/lib/udev/rules.d/*-dlm.rules
+%defattr(-,root,root,-)
+%{_prefix}/lib/udev/rules.d/*-dlm.rules
 %{_libdir}/libdlm*.so.*
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name}-lib = %{version}-%{release}
 Conflicts:      clusterlib-devel
 
@@ -94,44 +99,35 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %files          devel
+%defattr(-,root,root,-)
 %{_libdir}/libdlm*.so
 %{_includedir}/libdlm*.h
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Wed Aug 25 2021 David Teigland <teigland@redhat.com> - 4.0.9-7
-- fix pacemaker header
+* Wed Jan 13 2021 David Teigland <teigland@redhat.com> - 4.1.0-1
+- update to 4.1.0
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Jan 06 2021 David Teigland <teigland@redhat.com> - 4.0.9-4
+- dlm_controld: use new quorum api to detect missed failures
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.9-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-3
+- kick gating system
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Wed Jun 12 2019 David Teigland <teigland@redhat.com> - 4.0.9-2
+- try to kick gating system
 
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Tue Jun 11 2019 David Teigland <teigland@redhat.com> - 4.0.9-1
+- update to 4.0.9
 
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Wed Jan 23 2019 David Teigland <teigland@redhat.com> - 4.0.6-10
+- dlm_controld: ignore unwanted uevent strings
 
-* Wed Jul 31 2019 David Teigland <teigland@redhat.com> - 4.0.9-1
-- New upstream realease
+* Tue Oct 02 2018 David Teigland <teigland@redhat.com> - 4.0.6-9
+- update makefile gcc flags
 
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Mar 24 2018 Richard W.M. Jones <rjones@redhat.com> - 4.0.6-8
-- Fixes for glibc 2.27, required for riscv64.
+* Thu Aug 09 2018 David Teigland <teigland@redhat.com> - 4.0.6-8
+- Work around glibc regression for major/minor header
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild