From 1438c3930502972c3eefbd2844165bf4e48b1e75 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 19 Mar 2026 10:45:30 +0000
Subject: [PATCH] Rebase to libnbd 1.25.4 Synch spec file with Fedora resolves:
 RHEL-153363

---
 copy-patches.sh |  2 +-
 libnbd.spec     | 13 +++++++++----
 sources         |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/copy-patches.sh b/copy-patches.sh
index 83f126a..f53da82 100755
--- a/copy-patches.sh
+++ b/copy-patches.sh
@@ -6,7 +6,7 @@ set -e
 # directory.  Use it like this:
 #   ./copy-patches.sh
 
-rhel_version=10.2
+rhel_version=10.3
 
 # Check we're in the right directory.
 if [ ! -f libnbd.spec ]; then
diff --git a/libnbd.spec b/libnbd.spec
index 75d3e09..8d21305 100644
--- a/libnbd.spec
+++ b/libnbd.spec
@@ -17,10 +17,10 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.24-stable
+%global source_directory 1.25-development
 
 Name:           libnbd
-Version:        1.24.1
+Version:        1.25.4
 Release:        1%{?dist}
 Summary:        NBD client library in userspace
 
@@ -38,7 +38,7 @@ Source2:       libguestfs.keyring
 Source3:        copy-patches.sh
 
 # Patches are stored in the upstream repository:
-# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-10.2/
+# https://gitlab.com/nbdkit/libnbd/-/commits/rhel-10.3/
 
 # Patches.
 #(nothing)
@@ -407,7 +407,12 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
-* Tue Feb 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1.24.1-1
+* Thu Mar 19 2026 Richard W.M. Jones <rjones@redhat.com> - 1.25.4-1
+- Rebase to libnbd 1.25.4
+- Synch spec file with Fedora
+  resolves: RHEL-153363
+
+* Tue Feb 17 2026 Richard W.M. Jones <rjones@redhat.com> - 1.24.1-1
 - Rebase to libnbd 1.24.1
   resolves: RHEL-111243
 - Synch spec file with Fedora
diff --git a/sources b/sources
index a0373ae..bbe7d31 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libnbd-1.24.1.tar.gz) = 0977463cd62692fc731cae6d323bfbc4ed7117a598a08c650c2be1b065edb3aa8d93f21a7e59ae870bf289878d3e81eff73441b496cd2b2bc95cf367d80abd52
-SHA512 (libnbd-1.24.1.tar.gz.sig) = 134c0360cf2e2f4923f878feaec8edc531f3e34616e402e593e8a41ab0091b804505c0425fc1d3758423a3e101f185162353bd81812d067710747fca6ba533f5
+SHA512 (libnbd-1.25.4.tar.gz) = 1439a13a1c828d979ef7363ed70f769d6012ea49f2f796dedbdf24f9581e440110131593d5ad1461d3bdf3ec70d95dc6b0a5bfe7583b5d0cd17cf852a592474e
+SHA512 (libnbd-1.25.4.tar.gz.sig) = 2481ab599cbe9137e2546f6b5fccd958db2729753f271826755c04136e47e5f768a5c61457364b339eaa64b30412863fb926214df141b1ba438fd1e875c42a0e