From 023449b10fc9497445818c44b7c82468722c378d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 2 Jan 2026 10:05:09 +0000
Subject: [PATCH 1/3] New upstream development version 1.47.1

---
 nbdkit.spec | 7 +++++--
 sources     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index ad4bade..68ec282 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -51,10 +51,10 @@
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.46-stable
+%global source_directory 1.47-development
 
 Name:           nbdkit
-Version:        1.46.0
+Version:        1.47.1
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -1582,6 +1582,9 @@ fi
 
 
 %changelog
+* Fri Jan 02 2026 Richard W.M. Jones <rjones@redhat.com> - 1.47.1-1
+- New upstream development version 1.47.1
+
 * Sat Dec 20 2025 Richard W.M. Jones <rjones@redhat.com> - 1.46.0-1
 - New upstream stable version 1.46.0
 
diff --git a/sources b/sources
index 4462799..f8f8acc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.46.0.tar.gz) = ed225bdbd5c1e96b40ed0493f72173853cedafc9ada2296e6418021d4e3f2e6732dbbb764d24baf6263f4b07c3868b05207518d34667fe68c7324360fc3f5254
-SHA512 (nbdkit-1.46.0.tar.gz.sig) = 73c37deac7f18c7a55d401bf569aabc0a017872fc8ed3e4554f32a1007367d6db975c80cdfc3310c3c13ebaf0c506fcf0563360ee663784a653852ec6bde0e3a
+SHA512 (nbdkit-1.47.1.tar.gz) = 0c9d1da067bf1f7b6ba38dad33e86dff1fe893ff2e4a349dfcd6b259295fd00670e6af6c195e130d8a847520a78a730003315e60afda8eb94758e2195bd1a775
+SHA512 (nbdkit-1.47.1.tar.gz.sig) = 131d9bc191155186408ef7a577f9d2a2cc1fd1b53cbda755d19ff8de1341479a517fab79cc87f04a1bca5518046c24a8647cb4949d5c4d6fdca19ca968604c16

From 31764d38fbea6df335bff77f9accfc97780c8a95 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 2 Jan 2026 12:01:10 +0000
Subject: [PATCH 2/3] Add upstream fix for broken test

---
 ...-debug-hexdump.sh-Fix-test-that-plug.patch | 31 +++++++++++++++++++
 nbdkit.spec                                   |  3 ++
 2 files changed, 34 insertions(+)
 create mode 100644 0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch

diff --git a/0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch b/0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch
new file mode 100644
index 0000000..ab06e22
--- /dev/null
+++ b/0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch
@@ -0,0 +1,31 @@
+From 4076ff58512ee98928b1bdb13274466b175e1a97 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 2 Jan 2026 11:59:11 +0000
+Subject: [PATCH] tests/test-ocaml-debug-hexdump.sh: Fix test that plugin was
+ built
+
+This is supposed to check that the test plugin was built and skip if
+not.  However because the 'requires' function call was missing, it
+actually failed the test if not built.
+
+Fixes: commit ec3be5030656a9126abbb0bceeb5a1ecf6898c6a
+---
+ tests/test-ocaml-debug-hexdump.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test-ocaml-debug-hexdump.sh b/tests/test-ocaml-debug-hexdump.sh
+index 5cc71375..3954225e 100755
+--- a/tests/test-ocaml-debug-hexdump.sh
++++ b/tests/test-ocaml-debug-hexdump.sh
+@@ -36,7 +36,7 @@ set -x
+ set -u
+ 
+ plugin=$abs_top_srcdir/tests/test-ocaml-debug-hexdump-plugin.$SOEXT
+-test -x "$plugin"
++requires test -x "$plugin"
+ 
+ requires_run
+ requires_nbdsh_uri
+-- 
+2.52.0
+
diff --git a/nbdkit.spec b/nbdkit.spec
index 68ec282..4639625 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -86,6 +86,9 @@ Source6:        %{modulename}.te
 Source7:        %{modulename}.if
 Source8:        %{modulename}.fc
 
+# Fix for broken test, upstream in nbdkit >= 1.47.2
+Patch:          0001-tests-test-ocaml-debug-hexdump.sh-Fix-test-that-plug.patch
+
 # For applying the patches:
 BuildRequires:  git
 

From df7b23c694ef7fc148cb65fe2313fbeab0710f46 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 12 Jan 2026 15:58:37 -0700
Subject: [PATCH 3/3] Fix a changelog entry

---
 nbdkit.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index 4639625..c306b50 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -1648,7 +1648,7 @@ fi
 - New upstream version 1.45.2
 - New map filter.
 
-* Fri Jul 11 2025 Jerry James  <loganjerry@gmail.com> - 1.45.1-5
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 1.45.1-5
 - Rebuild to fix OCaml dependencies
 
 * Wed Jul 09 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1.45.1-4