From 0257d4fe2ec3e5c103f3dc5453d2d845832a4e5d Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Thu, 11 Jun 2026 14:08:31 +0200
Subject: [PATCH] Rebase to same version as RHEL 10

Resolves: RHEL-180724

Signed-off-by: Siteshwar Vashisht <svashisht@redhat.com>
---
 numad-0.5git-m-option.patch | 19 -------------------
 numad.spec                  | 11 +++++------
 sources                     |  2 +-
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 numad-0.5git-m-option.patch

diff --git a/numad-0.5git-m-option.patch b/numad-0.5git-m-option.patch
deleted file mode 100644
index 5a31816..0000000
--- a/numad-0.5git-m-option.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/numad.spec b/numad.spec
index 81aaf76..e7a6e61 100644
--- a/numad.spec
+++ b/numad.spec
@@ -2,10 +2,10 @@
 
 Name: numad
 Version: 0.5
-Release: 37.20150602git%{?dist}
+Release: 50.20251104git%{?dist}
 Summary: NUMA user daemon
 
-License: LGPLv2
+License: LGPL-2.1-only
 URL: https://pagure.io/numad
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
@@ -14,10 +14,6 @@ URL: https://pagure.io/numad
 Source0: %{name}-%{version}git.tar.xz
 Patch0: 0000-remove-conf.patch
 
-# RHEL-16571
-# 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
@@ -63,6 +59,9 @@ install -p -m 644 numad.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %systemd_postun numad.service
 
 %changelog
+* Thu Jun 11 2026 Siteshwar Vashisht <svashisht@redhat.com> - 0.5-50.20251104git
+- Rebase to same version as RHEL 10 (RHEL-180724)
+
 * Wed Nov 15 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.5-37.20150602git
 - recognize the -m option (RHEL-16571)
 
diff --git a/sources b/sources
index c095ad4..ab9f54d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-033639e6d3e8df2fadc7a6606a0929c8  numad-0.5git.tar.xz
+SHA512 (numad-0.5git.tar.xz) = a543779f35cc40b9965b83b182749c4d03493d695950b94fb85808fb9ee08f5a2b4dab07d86effe151ac706f3673fcd057301929497a08127dc1a101ed9d2783