!3 dlm_controld: remove unnecessary header include

From: @chen-jan 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

0030-dlm_controld-remove-unnecessary-header-include.patch

@@ -0,0 +1,33 @@
+From ddbba6608896f81bfce8f8edf3d0f507714cfc43 Mon Sep 17 00:00:00 2001
+From: Alexander Aring <aahringo@redhat.com>
+Date: Wed, 24 May 2023 08:56:41 -0400
+Subject: [PATCH 30/32] dlm_controld: remove unnecessary header include
+
+The timewarn netlink functionality got dropped and will be removed by
+kernel v6.4. The user space part was already dropped by commit 34ea31e7
+("controld: remove timewarn handling"). This is just a left over of this
+commit. Recent builds fails now because the UAPI header in the Linux
+kernel was removed. This means older dlm sources cannot be build with
+newer kernel-headers, however it is not recommended to use older dlm
+sources and all existing users should upgrade anyway.
+
+Reported-by: Fabio M. Di Nitto <fdinitto@redhat.com>
+---
+ dlm_controld/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dlm_controld/main.c b/dlm_controld/main.c
+index c9d1c5f1..14be5edd 100644
+--- a/dlm_controld/main.c
++++ b/dlm_controld/main.c
+@@ -12,7 +12,6 @@
+ #include <pthread.h>
+ #include <linux/netlink.h>
+ #include <linux/genetlink.h>
+-#include <linux/dlm_netlink.h>
+ #include <uuid/uuid.h>
+ 
+ #ifdef USE_SD_NOTIFY
+-- 
+2.41.0
+

dlm.spec

@@ -1,6 +1,6 @@
 Name:           dlm
 Version:        4.1.0
-Release:        1
+Release:        2
 License:        GPLv2 and GPLv2+ and LGPLv2+
 Group:          System Environment/Kernel
 Summary:        dlm control daemon and tool
@@ -12,6 +12,7 @@ BuildRequires:  libxml2-devel
 BuildRequires:  systemd-units
 BuildRequires:  systemd-devel
 Source0:	https://releases.pagure.org/dlm/%{name}-%{version}.tar.gz
+Patch0001:	0030-dlm_controld-remove-unnecessary-header-include.patch
 
 Requires:       %{name}-lib = %{version}-%{release}
 Requires:       corosync >= 1.99.9
@@ -20,6 +21,7 @@ Requires(preun): systemd-units
 Requires(postun): systemd-units
 Conflicts: cman
 
+
 %description
 The kernel dlm requires a user daemon to control membership.
 
@@ -43,7 +45,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
 
 %build
 CFLAGS+=$RPM_OPT_FLAGS make
@@ -94,6 +96,9 @@ install -Dm 0644 init/dlm.sysconfig %{buildroot}/etc/sysconfig/dlm
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Jul 18 2023 chenchen <chen_aka_jan@163.com> - 4.1.0-2
+- dlm_controld: remove unnecessary header include
+
 * Thu May 11 2023 xuxiaojuan <xuxiaojuan@kylinos.cn> - 4.1.0-1
 - Package init