From 91bca196da46e1c1726039603ac841ec93cb1985 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Fri, 9 Aug 2024 13:19:54 -0500
Subject: [PATCH] Resolves: RHEL-53900

---
 .gitignore |  1 +
 dlm.spec   | 30 ++++++++++--------------------
 sources    |  2 +-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index a45acaf..ad922c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /dlm-4.0.9.tar.gz
 /dlm-4.1.0.tar.gz
 /dlm-4.2.0.tar.gz
+/dlm-4.3.0.tar.gz
diff --git a/dlm.spec b/dlm.spec
index a2338ba..5c0da94 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,6 +1,6 @@
 Name:           dlm
-Version:        4.2.0
-Release:        6%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
 Summary:        dlm control daemon and tool
@@ -15,39 +15,28 @@ BuildRequires:  systemd-devel
 BuildRequires: make
 Source0:	https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
 
-Patch0: 0001-Revert-treewide-add-fcf-protection-full-to-CFLAGS.patch
-# Fix FTBFS with 6.4 kernel
-Patch30: 0030-dlm_controld-remove-unnecessary-header-include.patch
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-ExclusiveArch: i686 x86_64
-%endif
-
 Requires:       %{name}-lib = %{version}-%{release}
 Requires:       corosync >= 3.1.0
 %{?fedora:Requires: kernel-modules-extra}
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Conflicts: cman
 
 %description
 The kernel dlm requires a user daemon to control membership.
 
 %prep
 %setup -q
-%patch0 -p1 -b .backup0
-%patch30 -p1 -b .backup30
 
 %build
 # upstream does not require configure
-# upstream does not support parallel builds
-%set_build_flags
-%make_build -j1
-%make_build -j1 -C fence
+# upstream does not support _smp_mflags
+CFLAGS=$RPM_OPT_FLAGS make
+CFLAGS=$RPM_OPT_FLAGS make -C fence
 
 %install
-%make_install LIBDIR=%{_libdir}
+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
@@ -75,7 +64,6 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
 
 %package        lib
 Summary:        Library for %{name}
-Conflicts:      clusterlib
 
 %description    lib
 The %{name}-lib package contains the libraries needed to use the dlm
@@ -90,7 +78,6 @@ from userland applications.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}-lib = %{version}-%{release}
-Conflicts:      clusterlib-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -102,6 +89,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Aug 09 2024 David Teigland <teigland@redhat.com> - 4.3.0-1
+- update to recent upstream version
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.2.0-6
 - Bump release for June 2024 mass rebuild
 
diff --git a/sources b/sources
index e26e20a..3b2039b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dlm-4.2.0.tar.gz) = b437373d292a6020c47bec2d2c3d630460332d2f0158033d719d156e3a6bead9bd37452ef7679da2cbac5d96a9d056a7daff203e45ddfe6dab47cc230abf48b9
+SHA512 (dlm-4.3.0.tar.gz) = 8c1ef71caaa58fee952535c7e3e40e14d632a8769fa100239e8e79476331bac2c09ca41a1172b857d0e57ecaa74b05dfc1fb1fa6994b72d24ea71585b449fdc4