From f6ad3d4b9c929d3f4046952274c003dda4381c2e Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Fri, 31 May 2024 16:56:36 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

---
 .numad.metadata                     |  1 -
 SOURCES/numad-0.5git-m-option.patch | 19 +++++++++++++++++++
 SPECS/numad.spec                    | 11 +++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)
 delete mode 100644 .numad.metadata
 create mode 100644 SOURCES/numad-0.5git-m-option.patch

diff --git a/.numad.metadata b/.numad.metadata
deleted file mode 100644
index f928d88..0000000
--- a/.numad.metadata
+++ /dev/null
@@ -1 +0,0 @@
-22146cf894b1e9bf662ea98f720a565fd759cb3f SOURCES/numad-0.5git.tar.xz
diff --git a/SOURCES/numad-0.5git-m-option.patch b/SOURCES/numad-0.5git-m-option.patch
new file mode 100644
index 0000000..5a31816
--- /dev/null
+++ b/SOURCES/numad-0.5git-m-option.patch
@@ -0,0 +1,19 @@
+commit cf6c2c029edc9c288122bcd603a72eb7f6d042d2
+Author: Jan Synacek <jsynacek@redhat.com>
+Date:   Mon Oct 30 11:37:45 2017 +0100
+
+    recognize -m option correctly
+
+diff --git a/numad.c b/numad.c
+index 4c85486..0721af4 100644
+--- a/numad.c
++++ b/numad.c
+@@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) {
+     int x_flag = 0;
+     int tmp_int = 0;
+     long list_pid = 0;
+-    while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:p:r:R:S:t:u:vVw:x:")) != -1) {
++    while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:m:p:r:R:S:t:u:vVw:x:")) != -1) {
+         switch (opt) {
+         case 'C':
+             C_flag = 1;
diff --git a/SPECS/numad.spec b/SPECS/numad.spec
index 74c57c3..4dd6375 100644
--- a/SPECS/numad.spec
+++ b/SPECS/numad.spec
@@ -2,7 +2,7 @@
 
 Name: numad
 Version: 0.5
-Release: 26.20150602git%{?dist}
+Release: 27.20150602git%{?dist}
 Summary: NUMA user daemon
 
 License: LGPLv2
@@ -14,6 +14,10 @@ URL: https://pagure.io/numad
 #   tar --exclude-vcs -cJf numad-0.5git.tar.xz numad-0.5git/
 Source0: %{name}-%{version}git.tar.xz
 
+# RHEL-16506
+# Upstream commit: https://pagure.io/numad/c/cf6c2c029edc9c288122bcd603a72eb7f6d042d2
+Patch1:  numad-0.5git-m-option.patch
+
 Requires: systemd-units
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -27,7 +31,7 @@ that monitors NUMA characteristics and manages placement of processes
 and memory to minimize memory latency and thus provide optimum performance.
 
 %prep
-%setup -q -n %{name}-%{version}git
+%autosetup -n %{name}-%{version}git
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -std=gnu99" LDFLAGS="$RPM_LD_FLAGS -lpthread -lrt -lm"
@@ -57,6 +61,9 @@ make install prefix=%{buildroot}/usr
 %systemd_postun numad.service
 
 %changelog
+* Wed Nov 15 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.5-27.20150602git
+- recognize the -m option (RHEL-16506)
+
 * Tue Jun 19 2018 Jan Synáček <jsynacek@redhat.com> - 0.5-26.20150602git
 - Remove initscripts from Requires (#1610280)