From c603006c36df6cab45b0402c709134f57400d51a Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 24 Jul 2023 10:50:32 -0400
Subject: [PATCH 01/28] Drop versioneer conditionals and let the dist-git
 branches diverge

---
 python-pymapvbvd.spec | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index aba8ec0..9fb5b75 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,20 +1,12 @@
-# In the releases mentioned in the expression, the system versioneer is too old
-# for the generated _version.py to have the get_version() function, and too old
-# for the License tag to be accurate. We must use the bundled, amalgamated
-# versioneer.py to generate _version.py.
-#
-# Otherwise, we can use the system versioneer to generate _version.py, and can
-# remove the bundled, amaglamated versioneer.py to indicate we aren’t using it.
-%bcond bundled_versioneer %{expr:0%{?fc37} || 0%{?fc38} || 0%{?el9}}
-
 Name:           python-pymapvbvd
 Version:        0.5.4
 Release:        %autorelease
 Summary:        Python twix file reader
 
 # The entire source is MIT, except:
-#   - The script versioneer.py and the file pymapvbvd/_version.py, which was
-#     generated by it, are both Unlicense.
+#   - The file pymapvbvd/_version.py, which is generated by python-versioneer,
+#     shares its license (Unlicense, for recent versions of Versioneer); see
+#     also versioneer.py (which is removed in %%prep)
 License:        MIT AND Unlicense
 URL:            https://github.com/wtclarke/pymapvbvd
 Source0:        %{pypi_source pyMapVBVD}
@@ -52,11 +44,6 @@ Summary:        %{summary}
 
 # The generated _version.py has the same license as python3dist(versioneer),
 # but we do not consider it to be bundled from Versioneer.
-%if %{with bundled_versioneer}
-# While versioneer.py is a bundled copy of python3dist(versioneer) = 0.28, it
-# is not included in the binary RPMs, so we still do not treat it as bundled,
-# and there is no corresponding virtual Provides.
-%endif
 
 %description -n python3-pymapvbvd %{common_description}
 
@@ -64,24 +51,18 @@ Summary:        %{summary}
 %prep
 %autosetup -n pyMapVBVD-%{version} -p1
 %setup -q -T -D -b 1 -n pyMapVBVD-%{version}
-%if %{without bundled_versioneer}
+# We can use the system versioneer to generate _version.py, and can remove the
+# bundled, amaglamated versioneer.py to indicate we aren’t using it.
 rm -v versioneer.py
-%endif
 
 
 %generate_buildrequires
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%if %{with bundled_versioneer}
-export PYTHONPATH="${PWD}"
-%endif
 %pyproject_buildrequires -x tests
 
 
 %build
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%if %{with bundled_versioneer}
-export PYTHONPATH="${PWD}"
-%endif
 %pyproject_wheel
 
 

From 13a8099fba2d5beafbecb1c0b37c670a98bbaaae Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 24 Jul 2023 11:41:24 -0400
Subject: [PATCH 02/28] Drop versioneer conditionals and let the dist-git
 branches diverge

---
 python-pymapvbvd.spec | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index aba8ec0..c4b5f73 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,12 +1,3 @@
-# In the releases mentioned in the expression, the system versioneer is too old
-# for the generated _version.py to have the get_version() function, and too old
-# for the License tag to be accurate. We must use the bundled, amalgamated
-# versioneer.py to generate _version.py.
-#
-# Otherwise, we can use the system versioneer to generate _version.py, and can
-# remove the bundled, amaglamated versioneer.py to indicate we aren’t using it.
-%bcond bundled_versioneer %{expr:0%{?fc37} || 0%{?fc38} || 0%{?el9}}
-
 Name:           python-pymapvbvd
 Version:        0.5.4
 Release:        %autorelease
@@ -52,11 +43,14 @@ Summary:        %{summary}
 
 # The generated _version.py has the same license as python3dist(versioneer),
 # but we do not consider it to be bundled from Versioneer.
-%if %{with bundled_versioneer}
+#
+# The system versioneer is too old for the generated _version.py to have the
+# get_version() function, and too old for the License tag to be accurate. We
+# must use the bundled, amalgamated versioneer.py to generate _version.py.
+#
 # While versioneer.py is a bundled copy of python3dist(versioneer) = 0.28, it
 # is not included in the binary RPMs, so we still do not treat it as bundled,
 # and there is no corresponding virtual Provides.
-%endif
 
 %description -n python3-pymapvbvd %{common_description}
 
@@ -64,24 +58,17 @@ Summary:        %{summary}
 %prep
 %autosetup -n pyMapVBVD-%{version} -p1
 %setup -q -T -D -b 1 -n pyMapVBVD-%{version}
-%if %{without bundled_versioneer}
-rm -v versioneer.py
-%endif
 
 
 %generate_buildrequires
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%if %{with bundled_versioneer}
 export PYTHONPATH="${PWD}"
-%endif
 %pyproject_buildrequires -x tests
 
 
 %build
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%if %{with bundled_versioneer}
 export PYTHONPATH="${PWD}"
-%endif
 %pyproject_wheel
 
 

From d9ad1a0d3cdb89354530fcf8a16aecb5a08dc39a Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 25 Jul 2023 09:01:27 -0400
Subject: [PATCH 03/28] Add mandatory ExcludeArch bug link

---
 python-pymapvbvd.spec | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 9fb5b75..8d29fd8 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -15,15 +15,8 @@ Source1:        pyMapVBVD-%{version}-test-data.tar.xz
 Source2:        get_test_data.sh
 
 BuildArch:      noarch
-# The library assumes that the host and the file format are both little-endian.
-# The necessary patch would not be trivial. Queried upstream:
-#
-# Big-endian host support?
-# https://github.com/wtclarke/pymapvbvd/issues/35
-#
-# A bug will be filed blocking F-ExcludeArch-s390x, per
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_architecture_build_failures,
-# once the package is imported.
+# PyMapVBVD assumes the platform is little-endian
+# https://bugzilla.redhat.com/show_bug.cgi?id=2225518
 ExcludeArch:    s390x
 
 BuildRequires:  python3-devel

From 2242a658007632a030a1bab1b9c377883d8778e4 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 25 Jul 2023 09:01:27 -0400
Subject: [PATCH 04/28] Add mandatory ExcludeArch bug link

---
 python-pymapvbvd.spec | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index c4b5f73..c97fef2 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -14,15 +14,8 @@ Source1:        pyMapVBVD-%{version}-test-data.tar.xz
 Source2:        get_test_data.sh
 
 BuildArch:      noarch
-# The library assumes that the host and the file format are both little-endian.
-# The necessary patch would not be trivial. Queried upstream:
-#
-# Big-endian host support?
-# https://github.com/wtclarke/pymapvbvd/issues/35
-#
-# A bug will be filed blocking F-ExcludeArch-s390x, per
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_architecture_build_failures,
-# once the package is imported.
+# PyMapVBVD assumes the platform is little-endian
+# https://bugzilla.redhat.com/show_bug.cgi?id=2225518
 ExcludeArch:    s390x
 
 BuildRequires:  python3-devel

From 182093c7967ea7ac354ff768ac9a5a04f5e88b9b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 10 Oct 2023 19:32:55 -0400
Subject: [PATCH 05/28] Update to 0.5.5 (close RHBZ#2243111)

---
 .gitignore            | 2 ++
 python-pymapvbvd.spec | 2 +-
 sources               | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6087923..32ff9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /pyMapVBVD-0.5.3.tar.gz
 /pyMapVBVD-0.5.4.tar.gz
 /pyMapVBVD-0.5.4-test-data.tar.xz
+/pyMapVBVD-0.5.5.tar.gz
+/pyMapVBVD-0.5.5-test-data.tar.xz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 8d29fd8..d458367 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.4
+Version:        0.5.5
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index 87b5987..4562551 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.4.tar.gz) = 1512db1aa15dcac460b87f100ecd9539a274f6b740f4024aee283cbc7fe3a0f466accd01e76bc393492c0088a797adaa0ae158c58ee36310ff6b0bac1666fb30
-SHA512 (pyMapVBVD-0.5.4-test-data.tar.xz) = c29bcd449fb39d2449a1c3e555d4d61f80bc09102156d2103366bad610fe70e3c0152e417899db4e51879faec61a6d087576332c16f82bb30eedc2296026bef6
+SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
+SHA512 (pyMapVBVD-0.5.5-test-data.tar.xz) = 8b0d548e1100b15942158e240e795b05a82a3c62ae44f4ccaea84977d4373c19d9ae6b93cd42f49823c4fbf113c3470e72431889d6aff870c4c6fed7202befa8

From d86e99f41225111142f5da0fa5c952a28d4be140 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 10 Oct 2023 19:32:55 -0400
Subject: [PATCH 06/28] Update to 0.5.5 (close RHBZ#2243111)

---
 .gitignore            | 2 ++
 python-pymapvbvd.spec | 2 +-
 sources               | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6087923..32ff9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /pyMapVBVD-0.5.3.tar.gz
 /pyMapVBVD-0.5.4.tar.gz
 /pyMapVBVD-0.5.4-test-data.tar.xz
+/pyMapVBVD-0.5.5.tar.gz
+/pyMapVBVD-0.5.5-test-data.tar.xz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index c97fef2..8247205 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.4
+Version:        0.5.5
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index 87b5987..4562551 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.4.tar.gz) = 1512db1aa15dcac460b87f100ecd9539a274f6b740f4024aee283cbc7fe3a0f466accd01e76bc393492c0088a797adaa0ae158c58ee36310ff6b0bac1666fb30
-SHA512 (pyMapVBVD-0.5.4-test-data.tar.xz) = c29bcd449fb39d2449a1c3e555d4d61f80bc09102156d2103366bad610fe70e3c0152e417899db4e51879faec61a6d087576332c16f82bb30eedc2296026bef6
+SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
+SHA512 (pyMapVBVD-0.5.5-test-data.tar.xz) = 8b0d548e1100b15942158e240e795b05a82a3c62ae44f4ccaea84977d4373c19d9ae6b93cd42f49823c4fbf113c3470e72431889d6aff870c4c6fed7202befa8

From 7af02076160d0248c371a72b5dd51fdfce031a8e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Oct 2023 12:25:00 -0400
Subject: [PATCH 07/28] Make the test data source archive mostly-reproducible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should keep us from having to upload a fresh archive to the
lookaside cache for a new version when the data hasn’t actually
changed.
---
 .gitignore            |  1 +
 get_test_data.sh      | 25 +++++++++++++++++++++----
 python-pymapvbvd.spec |  4 ++--
 sources               |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32ff9af..3216808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /pyMapVBVD-0.5.4-test-data.tar.xz
 /pyMapVBVD-0.5.5.tar.gz
 /pyMapVBVD-0.5.5-test-data.tar.xz
+/pyMapVBVD-test-data.tar.xz
diff --git a/get_test_data.sh b/get_test_data.sh
index ab40fbd..a43c1ee 100755
--- a/get_test_data.sh
+++ b/get_test_data.sh
@@ -11,8 +11,13 @@ Usage: $1 VERSION
 
 Generate a source archive containing the test data files for pyMapVBVD that are
 tracked in git LFS and are not included in the default source archive. The
-result will be named pyMapVBVD-\${VERSION}-test-data.tar.xz and will be written
+result will be named pyMapVBVD-test-data.tar.xz and will be written
 into the current working directory.
+
+The script attempts to produce a reproducible archive to avoid uploading
+near-duplicate archives to the lookaside cache when the test data does not
+change from one version to the next. Accordingly, the top-level directory
+pyMapVBVD-\${VERSION}/ is omitted from the archived paths.
 EOF
 }
 
@@ -41,7 +46,7 @@ GITDIR="$(echo "${FORGEURL}" | sed -r 's@.*/@@')"
 #SOURCE0="${FORGEURL}/archive/${VERSION}/pdfminer.six-${VERSION}.tar.gz"
 #TARNAME="$(basename "${SOURCE0}")"
 TARDIR="pyMapVBVD-${VERSION}"
-NEWTAR="${TARDIR}-test-data.tar.xz"
+NEWTAR='pyMapVBVD-test-data.tar.xz'
 
 SAVEDIR="${PWD}"
 XDIR="$(mktemp -d)"
@@ -61,8 +66,20 @@ git lfs ls-files -n |
 		ln "${fn}" "${DESTDIR}/$(basename "${fn}")"
 	done
 
-cd "${XDIR}"
-tar -cv "${TARDIR}/" | xz -9e > "${NEWTAR}"
+cd "${XDIR}/${TARDIR}"
+# https://www.gnu.org/software/tar/manual/html_section/Reproducibility.html
+# We discard mtimes entirely, since git doesn’t store mtimes and they are just
+# the time we did the git clone.
+TZ=UTC LC_ALL=C tar \
+		--create --verbose \
+		--sort=name \
+		--format=posix \
+		--numeric-owner --owner=0 --group=0 \
+		--mode=go+u,go-w \
+		--pax-option='delete=atime,delete=ctime' \
+		--clamp-mtime --mtime='@0' \
+		. |
+	xz -9e > "${XDIR}/${NEWTAR}"
 
 cd "${SAVEDIR}"
 mv -v "${XDIR}/${NEWTAR}" .
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index d458367..6343b06 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -11,7 +11,7 @@ License:        MIT AND Unlicense
 URL:            https://github.com/wtclarke/pymapvbvd
 Source0:        %{pypi_source pyMapVBVD}
 # Generated with Source2: ./get_test_data.sh %%{version}
-Source1:        pyMapVBVD-%{version}-test-data.tar.xz
+Source1:        pyMapVBVD-test-data.tar.xz
 Source2:        get_test_data.sh
 
 BuildArch:      noarch
@@ -43,7 +43,7 @@ Summary:        %{summary}
 
 %prep
 %autosetup -n pyMapVBVD-%{version} -p1
-%setup -q -T -D -b 1 -n pyMapVBVD-%{version}
+%setup -q -T -D -a 1 -c -n pyMapVBVD-%{version}
 # We can use the system versioneer to generate _version.py, and can remove the
 # bundled, amaglamated versioneer.py to indicate we aren’t using it.
 rm -v versioneer.py
diff --git a/sources b/sources
index 4562551..bc0690d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
-SHA512 (pyMapVBVD-0.5.5-test-data.tar.xz) = 8b0d548e1100b15942158e240e795b05a82a3c62ae44f4ccaea84977d4373c19d9ae6b93cd42f49823c4fbf113c3470e72431889d6aff870c4c6fed7202befa8
+SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd

From 1d65d50d52eadceb18d20f22c303f9447c71f5eb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Oct 2023 13:12:11 -0400
Subject: [PATCH 08/28] Update to 0.5.6 (close RHBZ#2243258)

---
 .gitignore            | 1 +
 python-pymapvbvd.spec | 2 +-
 sources               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3216808..16ef41a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /pyMapVBVD-0.5.5.tar.gz
 /pyMapVBVD-0.5.5-test-data.tar.xz
 /pyMapVBVD-test-data.tar.xz
+/pyMapVBVD-0.5.6.tar.gz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 6343b06..dad89f7 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.5
+Version:        0.5.6
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index bc0690d..6457ba0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
+SHA512 (pyMapVBVD-0.5.6.tar.gz) = 72f22bf9c8fe8d8e4e4bc476312bacb83a434861b1f6ddd6ae0bf4a834da9a489547c5a90c49aeaf54dcd64d7695bb013019b413c828e7404c71ec15eb13699f
 SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd

From dcbe27394e21d0bc57e844d84a5f1bfe16a52ffa Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Oct 2023 12:25:00 -0400
Subject: [PATCH 09/28] Make the test data source archive mostly-reproducible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should keep us from having to upload a fresh archive to the
lookaside cache for a new version when the data hasn’t actually
changed.
---
 .gitignore            |  1 +
 get_test_data.sh      | 25 +++++++++++++++++++++----
 python-pymapvbvd.spec |  4 ++--
 sources               |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32ff9af..3216808 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /pyMapVBVD-0.5.4-test-data.tar.xz
 /pyMapVBVD-0.5.5.tar.gz
 /pyMapVBVD-0.5.5-test-data.tar.xz
+/pyMapVBVD-test-data.tar.xz
diff --git a/get_test_data.sh b/get_test_data.sh
index ab40fbd..a43c1ee 100755
--- a/get_test_data.sh
+++ b/get_test_data.sh
@@ -11,8 +11,13 @@ Usage: $1 VERSION
 
 Generate a source archive containing the test data files for pyMapVBVD that are
 tracked in git LFS and are not included in the default source archive. The
-result will be named pyMapVBVD-\${VERSION}-test-data.tar.xz and will be written
+result will be named pyMapVBVD-test-data.tar.xz and will be written
 into the current working directory.
+
+The script attempts to produce a reproducible archive to avoid uploading
+near-duplicate archives to the lookaside cache when the test data does not
+change from one version to the next. Accordingly, the top-level directory
+pyMapVBVD-\${VERSION}/ is omitted from the archived paths.
 EOF
 }
 
@@ -41,7 +46,7 @@ GITDIR="$(echo "${FORGEURL}" | sed -r 's@.*/@@')"
 #SOURCE0="${FORGEURL}/archive/${VERSION}/pdfminer.six-${VERSION}.tar.gz"
 #TARNAME="$(basename "${SOURCE0}")"
 TARDIR="pyMapVBVD-${VERSION}"
-NEWTAR="${TARDIR}-test-data.tar.xz"
+NEWTAR='pyMapVBVD-test-data.tar.xz'
 
 SAVEDIR="${PWD}"
 XDIR="$(mktemp -d)"
@@ -61,8 +66,20 @@ git lfs ls-files -n |
 		ln "${fn}" "${DESTDIR}/$(basename "${fn}")"
 	done
 
-cd "${XDIR}"
-tar -cv "${TARDIR}/" | xz -9e > "${NEWTAR}"
+cd "${XDIR}/${TARDIR}"
+# https://www.gnu.org/software/tar/manual/html_section/Reproducibility.html
+# We discard mtimes entirely, since git doesn’t store mtimes and they are just
+# the time we did the git clone.
+TZ=UTC LC_ALL=C tar \
+		--create --verbose \
+		--sort=name \
+		--format=posix \
+		--numeric-owner --owner=0 --group=0 \
+		--mode=go+u,go-w \
+		--pax-option='delete=atime,delete=ctime' \
+		--clamp-mtime --mtime='@0' \
+		. |
+	xz -9e > "${XDIR}/${NEWTAR}"
 
 cd "${SAVEDIR}"
 mv -v "${XDIR}/${NEWTAR}" .
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 8247205..df555bd 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -10,7 +10,7 @@ License:        MIT AND Unlicense
 URL:            https://github.com/wtclarke/pymapvbvd
 Source0:        %{pypi_source pyMapVBVD}
 # Generated with Source2: ./get_test_data.sh %%{version}
-Source1:        pyMapVBVD-%{version}-test-data.tar.xz
+Source1:        pyMapVBVD-test-data.tar.xz
 Source2:        get_test_data.sh
 
 BuildArch:      noarch
@@ -50,7 +50,7 @@ Summary:        %{summary}
 
 %prep
 %autosetup -n pyMapVBVD-%{version} -p1
-%setup -q -T -D -b 1 -n pyMapVBVD-%{version}
+%setup -q -T -D -a 1 -c -n pyMapVBVD-%{version}
 
 
 %generate_buildrequires
diff --git a/sources b/sources
index 4562551..bc0690d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
-SHA512 (pyMapVBVD-0.5.5-test-data.tar.xz) = 8b0d548e1100b15942158e240e795b05a82a3c62ae44f4ccaea84977d4373c19d9ae6b93cd42f49823c4fbf113c3470e72431889d6aff870c4c6fed7202befa8
+SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd

From c81aa02054790e52541f445836d33b94980451ef Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 11 Oct 2023 13:12:11 -0400
Subject: [PATCH 10/28] Update to 0.5.6 (close RHBZ#2243258)

---
 .gitignore            | 1 +
 python-pymapvbvd.spec | 2 +-
 sources               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3216808..16ef41a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /pyMapVBVD-0.5.5.tar.gz
 /pyMapVBVD-0.5.5-test-data.tar.xz
 /pyMapVBVD-test-data.tar.xz
+/pyMapVBVD-0.5.6.tar.gz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index df555bd..0eff282 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.5
+Version:        0.5.6
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index bc0690d..6457ba0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.5.tar.gz) = 7757d9963879efd4e69c6d61ec3e6fcd98153118f891b958351c720705c57cf48ec3dfc459ab0f69fe00b5d9bddc53621340f7b1f6bb88385408932b9fd32b19
+SHA512 (pyMapVBVD-0.5.6.tar.gz) = 72f22bf9c8fe8d8e4e4bc476312bacb83a434861b1f6ddd6ae0bf4a834da9a489547c5a90c49aeaf54dcd64d7695bb013019b413c828e7404c71ec15eb13699f
 SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd

From e99ed75cef42a238ef447985d384230aa9ba4edb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 18 Dec 2023 14:43:23 -0500
Subject: [PATCH 11/28] Assert that %pyproject_files contains a license file

---
 python-pymapvbvd.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index dad89f7..98ef714 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -61,7 +61,7 @@ export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
 
 %install
 %pyproject_install
-%pyproject_save_files mapvbvd
+%pyproject_save_files -l mapvbvd
 
 
 %check
@@ -69,7 +69,6 @@ export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
 
 
 %files -n python3-pymapvbvd -f %{pyproject_files}
-# pyproject_files handles LICENSE; verify with “rpm -qL -p …”
 %doc README.md
 
 

From 7d8bc655ba00724d094ab36c1671264c536a6c00 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 05:42:40 +0000
Subject: [PATCH 12/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From d82aa4072a8c06ddba20a08ccdc106d5bb8f4243 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jan 2024 08:47:13 +0000
Subject: [PATCH 13/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From f2f44d0e41544f2d856d1f1e10d6f2f6bbefca9e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 31 Jan 2024 20:07:19 -0500
Subject: [PATCH 14/28] Update to 0.5.7 (close RHBZ#2262160)

---
 .gitignore            | 1 +
 python-pymapvbvd.spec | 2 +-
 sources               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16ef41a..21f69e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /pyMapVBVD-0.5.5-test-data.tar.xz
 /pyMapVBVD-test-data.tar.xz
 /pyMapVBVD-0.5.6.tar.gz
+/pyMapVBVD-0.5.7.tar.gz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 98ef714..836ac8c 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.6
+Version:        0.5.7
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index 6457ba0..2cc74d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.6.tar.gz) = 72f22bf9c8fe8d8e4e4bc476312bacb83a434861b1f6ddd6ae0bf4a834da9a489547c5a90c49aeaf54dcd64d7695bb013019b413c828e7404c71ec15eb13699f
-SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd
+SHA512 (pyMapVBVD-0.5.7.tar.gz) = 0efd2d12ec48ae7f825095edf440d14064cf0f1690ab7dee63f247a923d359f633d057086a1d3defd2bd1606dbba0d1fabe2f6360f3658d04c78f347b61771ce
+SHA512 (pyMapVBVD-test-data.tar.xz) = e082c5c296c67d62dbfaa631a8507427ac74375902b2038bf5de58aed39f3ce71dd013318cb262d66bc3ab7bb0c560ea7228b52da09ed7361a0396b16e71b974

From 73a12053bc8cce3dea0c71aa3ffca561f454dc03 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 18 Dec 2023 14:43:23 -0500
Subject: [PATCH 15/28] Assert that %pyproject_files contains a license file

---
 python-pymapvbvd.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 0eff282..f37df30 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -67,7 +67,7 @@ export PYTHONPATH="${PWD}"
 
 %install
 %pyproject_install
-%pyproject_save_files mapvbvd
+%pyproject_save_files -l mapvbvd
 
 
 %check
@@ -75,7 +75,6 @@ export PYTHONPATH="${PWD}"
 
 
 %files -n python3-pymapvbvd -f %{pyproject_files}
-# pyproject_files handles LICENSE; verify with “rpm -qL -p …”
 %doc README.md
 
 

From c816ef12b0a097bb7a61955089f1869de6293645 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 31 Jan 2024 20:07:19 -0500
Subject: [PATCH 16/28] Update to 0.5.7 (close RHBZ#2262160)

---
 .gitignore            | 1 +
 python-pymapvbvd.spec | 2 +-
 sources               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16ef41a..21f69e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /pyMapVBVD-0.5.5-test-data.tar.xz
 /pyMapVBVD-test-data.tar.xz
 /pyMapVBVD-0.5.6.tar.gz
+/pyMapVBVD-0.5.7.tar.gz
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index f37df30..cfc0fcb 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.6
+Version:        0.5.7
 Release:        %autorelease
 Summary:        Python twix file reader
 
diff --git a/sources b/sources
index 6457ba0..2cc74d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.6.tar.gz) = 72f22bf9c8fe8d8e4e4bc476312bacb83a434861b1f6ddd6ae0bf4a834da9a489547c5a90c49aeaf54dcd64d7695bb013019b413c828e7404c71ec15eb13699f
-SHA512 (pyMapVBVD-test-data.tar.xz) = 9fa0530f68b02a8ff26fad1c463db217260c2f31a039b96f30a1fa6bb8b044ab8304edfd06abcaf5e9980ed355f29f0339c6e87e8dbddd67ae85457f384d45dd
+SHA512 (pyMapVBVD-0.5.7.tar.gz) = 0efd2d12ec48ae7f825095edf440d14064cf0f1690ab7dee63f247a923d359f633d057086a1d3defd2bd1606dbba0d1fabe2f6360f3658d04c78f347b61771ce
+SHA512 (pyMapVBVD-test-data.tar.xz) = e082c5c296c67d62dbfaa631a8507427ac74375902b2038bf5de58aed39f3ce71dd013318cb262d66bc3ab7bb0c560ea7228b52da09ed7361a0396b16e71b974

From e6b918c6f53a9f4422af1dbf14a1e5df4fa3e0cb Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 1 Apr 2024 22:07:41 -0400
Subject: [PATCH 17/28] Add an rpmlintrc file

[skip changelog]
---
 python-pymapvbvd.rpmlintrc | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 python-pymapvbvd.rpmlintrc

diff --git a/python-pymapvbvd.rpmlintrc b/python-pymapvbvd.rpmlintrc
new file mode 100644
index 0000000..3eb93a5
--- /dev/null
+++ b/python-pymapvbvd.rpmlintrc
@@ -0,0 +1,7 @@
+# Not real spelling errors.
+# - "dat" is from the extension ".dat"
+# - "twix" is a data format
+addFilter(r" spelling-error \('(dat|twix)',")
+# This source cannot be a URL because we must use a script to download its
+# contents from git-lfs.
+addFilter(r" invalid-url Source1: pyMapVBVD-test-data\.tar\.")

From d772e286e7cd3c6af9027f946dbdb731395ed36f Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 2 Apr 2024 00:20:13 -0400
Subject: [PATCH 18/28] Compress test data with zstd instead of xz

The result is a moderate size increase (~8%), but also tremendously
faster decompression, which results in a modest but noticeable
improvement in overall build time.

The real basis for the change is the relative upstream healths of the
two projects.
---
 .gitignore                 | 1 +
 get_test_data.sh           | 6 +++---
 python-pymapvbvd.rpmlintrc | 4 +++-
 python-pymapvbvd.spec      | 2 +-
 sources                    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21f69e7..12f6815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /pyMapVBVD-test-data.tar.xz
 /pyMapVBVD-0.5.6.tar.gz
 /pyMapVBVD-0.5.7.tar.gz
+/pyMapVBVD-test-data.tar.zst
diff --git a/get_test_data.sh b/get_test_data.sh
index a43c1ee..b732e29 100755
--- a/get_test_data.sh
+++ b/get_test_data.sh
@@ -11,7 +11,7 @@ Usage: $1 VERSION
 
 Generate a source archive containing the test data files for pyMapVBVD that are
 tracked in git LFS and are not included in the default source archive. The
-result will be named pyMapVBVD-test-data.tar.xz and will be written
+result will be named pyMapVBVD-test-data.tar.zst and will be written
 into the current working directory.
 
 The script attempts to produce a reproducible archive to avoid uploading
@@ -46,7 +46,7 @@ GITDIR="$(echo "${FORGEURL}" | sed -r 's@.*/@@')"
 #SOURCE0="${FORGEURL}/archive/${VERSION}/pdfminer.six-${VERSION}.tar.gz"
 #TARNAME="$(basename "${SOURCE0}")"
 TARDIR="pyMapVBVD-${VERSION}"
-NEWTAR='pyMapVBVD-test-data.tar.xz'
+NEWTAR='pyMapVBVD-test-data.tar.zst'
 
 SAVEDIR="${PWD}"
 XDIR="$(mktemp -d)"
@@ -79,7 +79,7 @@ TZ=UTC LC_ALL=C tar \
 		--pax-option='delete=atime,delete=ctime' \
 		--clamp-mtime --mtime='@0' \
 		. |
-	xz -9e > "${XDIR}/${NEWTAR}"
+	zstdmt --ultra -22 > "${XDIR}/${NEWTAR}"
 
 cd "${SAVEDIR}"
 mv -v "${XDIR}/${NEWTAR}" .
diff --git a/python-pymapvbvd.rpmlintrc b/python-pymapvbvd.rpmlintrc
index 3eb93a5..89c2d18 100644
--- a/python-pymapvbvd.rpmlintrc
+++ b/python-pymapvbvd.rpmlintrc
@@ -4,4 +4,6 @@
 addFilter(r" spelling-error \('(dat|twix)',")
 # This source cannot be a URL because we must use a script to download its
 # contents from git-lfs.
-addFilter(r" invalid-url Source1: pyMapVBVD-test-data\.tar\.")
+addFilter(r" invalid-url Source[0-9]+: pyMapVBVD-test-data\.tar\.zst$")
+# Bogus; it is a perfectly fine zstandard file.
+addFilter(r" inconsistent-file-extension pyMapVBVD-test-data\.tar\.zst$")
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 836ac8c..d88cbc7 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -11,7 +11,7 @@ License:        MIT AND Unlicense
 URL:            https://github.com/wtclarke/pymapvbvd
 Source0:        %{pypi_source pyMapVBVD}
 # Generated with Source2: ./get_test_data.sh %%{version}
-Source1:        pyMapVBVD-test-data.tar.xz
+Source1:        pyMapVBVD-test-data.tar.zst
 Source2:        get_test_data.sh
 
 BuildArch:      noarch
diff --git a/sources b/sources
index 2cc74d1..0935064 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (pyMapVBVD-0.5.7.tar.gz) = 0efd2d12ec48ae7f825095edf440d14064cf0f1690ab7dee63f247a923d359f633d057086a1d3defd2bd1606dbba0d1fabe2f6360f3658d04c78f347b61771ce
-SHA512 (pyMapVBVD-test-data.tar.xz) = e082c5c296c67d62dbfaa631a8507427ac74375902b2038bf5de58aed39f3ce71dd013318cb262d66bc3ab7bb0c560ea7228b52da09ed7361a0396b16e71b974
+SHA512 (pyMapVBVD-test-data.tar.zst) = 1b8106a2f0cde214eb545e09803ec042e7b40c93d9fbfcbe4d2b189b8d7146dc3ba4e63b53f9084bbee289e0bdcdd4f570453642b5553da9d70bdcdaf2ecd426

From 5f86ea8d9b0146d54da35b549d4757ed12533d7a Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Sat, 8 Jun 2024 20:58:47 +0200
Subject: [PATCH 19/28] Rebuilt for Python 3.13


From 278ccd0ab8d67271514bb2ff99025e6661d3ab68 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 3 Jul 2024 11:34:02 -0400
Subject: [PATCH 20/28] Update to 0.6.0 (close RHBZ#2295552)

---
 .gitignore                                    |  2 ++
 ...do-not-pin-the-scipy-version-and-all.patch | 26 +++++++++++++++++++
 get_test_data.sh                              |  8 +++---
 python-pymapvbvd.spec                         | 13 ++++++----
 sources                                       |  4 +--
 5 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch

diff --git a/.gitignore b/.gitignore
index 12f6815..da47b5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /pyMapVBVD-0.5.6.tar.gz
 /pyMapVBVD-0.5.7.tar.gz
 /pyMapVBVD-test-data.tar.zst
+/pymapvbvd-0.6.0.tar.gz
+/pymapvbvd-test-data.tar.zst
diff --git a/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch b/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
new file mode 100644
index 0000000..e2ecd93
--- /dev/null
+++ b/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
@@ -0,0 +1,26 @@
+From a9d7794e07a538bacc1fe2ff2887dbe6e2d0d95f Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Wed, 3 Jul 2024 11:52:05 -0400
+Subject: [PATCH] Downstream-only: do not pin the scipy version (and allow
+ 0.11.x)
+
+---
+ requirements.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.yml b/requirements.yml
+index 8b8b674..007181f 100644
+--- a/requirements.yml
++++ b/requirements.yml
+@@ -1,7 +1,7 @@
+ dependencies:
+  - numpy>=1.26
+  - tqdm
+- - scipy==1.13.*
++ - scipy>=1.11.3
+  - matplotlib
+  - h5py
+  - six
+-- 
+2.45.2
+
diff --git a/get_test_data.sh b/get_test_data.sh
index b732e29..395006a 100755
--- a/get_test_data.sh
+++ b/get_test_data.sh
@@ -11,13 +11,13 @@ Usage: $1 VERSION
 
 Generate a source archive containing the test data files for pyMapVBVD that are
 tracked in git LFS and are not included in the default source archive. The
-result will be named pyMapVBVD-test-data.tar.zst and will be written
+result will be named pymapvbvd-test-data.tar.zst and will be written
 into the current working directory.
 
 The script attempts to produce a reproducible archive to avoid uploading
 near-duplicate archives to the lookaside cache when the test data does not
 change from one version to the next. Accordingly, the top-level directory
-pyMapVBVD-\${VERSION}/ is omitted from the archived paths.
+pymapvbvd-\${VERSION}/ is omitted from the archived paths.
 EOF
 }
 
@@ -45,8 +45,8 @@ GITDIR="$(echo "${FORGEURL}" | sed -r 's@.*/@@')"
 
 #SOURCE0="${FORGEURL}/archive/${VERSION}/pdfminer.six-${VERSION}.tar.gz"
 #TARNAME="$(basename "${SOURCE0}")"
-TARDIR="pyMapVBVD-${VERSION}"
-NEWTAR='pyMapVBVD-test-data.tar.zst'
+TARDIR="pymapvbvd-${VERSION}"
+NEWTAR='pymapvbvd-test-data.tar.zst'
 
 SAVEDIR="${PWD}"
 XDIR="$(mktemp -d)"
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index d88cbc7..702ea93 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.5.7
+Version:        0.6.0
 Release:        %autorelease
 Summary:        Python twix file reader
 
@@ -9,11 +9,14 @@ Summary:        Python twix file reader
 #     also versioneer.py (which is removed in %%prep)
 License:        MIT AND Unlicense
 URL:            https://github.com/wtclarke/pymapvbvd
-Source0:        %{pypi_source pyMapVBVD}
+Source0:        %{pypi_source pymapvbvd}
 # Generated with Source2: ./get_test_data.sh %%{version}
-Source1:        pyMapVBVD-test-data.tar.zst
+Source1:        pymapvbvd-test-data.tar.zst
 Source2:        get_test_data.sh
 
+# Downstream-only: do not pin the scipy version (and allow 0.11.x)
+Patch:          0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
+
 BuildArch:      noarch
 # PyMapVBVD assumes the platform is little-endian
 # https://bugzilla.redhat.com/show_bug.cgi?id=2225518
@@ -42,8 +45,8 @@ Summary:        %{summary}
 
 
 %prep
-%autosetup -n pyMapVBVD-%{version} -p1
-%setup -q -T -D -a 1 -c -n pyMapVBVD-%{version}
+%autosetup -n pymapvbvd-%{version} -p1
+%setup -q -T -D -a 1 -c -n pymapvbvd-%{version}
 # We can use the system versioneer to generate _version.py, and can remove the
 # bundled, amaglamated versioneer.py to indicate we aren’t using it.
 rm -v versioneer.py
diff --git a/sources b/sources
index 0935064..67de59d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pyMapVBVD-0.5.7.tar.gz) = 0efd2d12ec48ae7f825095edf440d14064cf0f1690ab7dee63f247a923d359f633d057086a1d3defd2bd1606dbba0d1fabe2f6360f3658d04c78f347b61771ce
-SHA512 (pyMapVBVD-test-data.tar.zst) = 1b8106a2f0cde214eb545e09803ec042e7b40c93d9fbfcbe4d2b189b8d7146dc3ba4e63b53f9084bbee289e0bdcdd4f570453642b5553da9d70bdcdaf2ecd426
+SHA512 (pymapvbvd-0.6.0.tar.gz) = 59a6776858535d245dfdbee1037b41eccf74d7a68fb926ea6181fc14de9a31f3d46cb6aeaba10eb1b7a3b32ea2bdd9cf88243830eb1579edee6511e6260b8525
+SHA512 (pymapvbvd-test-data.tar.zst) = 638be0a8ad0e0876b13948d657bcf921e18938e964215c0c61b9deb6eb5f3abee449a0391238e8e60ffef55c4ca3b9c2906f4c4fd3655e23eed3567279e72323

From d965b583143080562d3fe4a1b2a543c12b3c7e83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 14:36:00 +0000
Subject: [PATCH 21/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 07249b40ddbc4d561a5ebfddbc0f71a9b7b8e03a Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 31 Oct 2024 14:27:26 -0400
Subject: [PATCH 22/28] Update to 0.6.1 (close RHBZ#2322960)

---
 .gitignore                                    |  1 +
 ...do-not-pin-the-scipy-version-and-all.patch | 26 -------------------
 python-pymapvbvd.spec                         |  5 +---
 sources                                       |  2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch

diff --git a/.gitignore b/.gitignore
index da47b5e..bba3f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /pyMapVBVD-test-data.tar.zst
 /pymapvbvd-0.6.0.tar.gz
 /pymapvbvd-test-data.tar.zst
+/pymapvbvd-0.6.1.tar.gz
diff --git a/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch b/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
deleted file mode 100644
index e2ecd93..0000000
--- a/0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9d7794e07a538bacc1fe2ff2887dbe6e2d0d95f Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Wed, 3 Jul 2024 11:52:05 -0400
-Subject: [PATCH] Downstream-only: do not pin the scipy version (and allow
- 0.11.x)
-
----
- requirements.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.yml b/requirements.yml
-index 8b8b674..007181f 100644
---- a/requirements.yml
-+++ b/requirements.yml
-@@ -1,7 +1,7 @@
- dependencies:
-  - numpy>=1.26
-  - tqdm
-- - scipy==1.13.*
-+ - scipy>=1.11.3
-  - matplotlib
-  - h5py
-  - six
--- 
-2.45.2
-
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 702ea93..50f756e 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -1,5 +1,5 @@
 Name:           python-pymapvbvd
-Version:        0.6.0
+Version:        0.6.1
 Release:        %autorelease
 Summary:        Python twix file reader
 
@@ -14,9 +14,6 @@ Source0:        %{pypi_source pymapvbvd}
 Source1:        pymapvbvd-test-data.tar.zst
 Source2:        get_test_data.sh
 
-# Downstream-only: do not pin the scipy version (and allow 0.11.x)
-Patch:          0001-Downstream-only-do-not-pin-the-scipy-version-and-all.patch
-
 BuildArch:      noarch
 # PyMapVBVD assumes the platform is little-endian
 # https://bugzilla.redhat.com/show_bug.cgi?id=2225518
diff --git a/sources b/sources
index 67de59d..8624192 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pymapvbvd-0.6.0.tar.gz) = 59a6776858535d245dfdbee1037b41eccf74d7a68fb926ea6181fc14de9a31f3d46cb6aeaba10eb1b7a3b32ea2bdd9cf88243830eb1579edee6511e6260b8525
+SHA512 (pymapvbvd-0.6.1.tar.gz) = b1c12e8f4c261522858feea9c66b5c174b37203a73a54aac8e2bbfb3ab7b1933ba44c9c172aa9cf7a97dba0c4554d99042c042fef9b42f73e912f747ceac1d55
 SHA512 (pymapvbvd-test-data.tar.zst) = 638be0a8ad0e0876b13948d657bcf921e18938e964215c0c61b9deb6eb5f3abee449a0391238e8e60ffef55c4ca3b9c2906f4c4fd3655e23eed3567279e72323

From 10664e9197249e6c11c44f3cb729e86f6fed9772 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 17:53:48 +0000
Subject: [PATCH 23/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From a7154955f9c96883e2ac0cc3fe65191c70a896fd Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 6 May 2025 14:53:52 -0400
Subject: [PATCH 24/28] F41+: Use the provisional pyproject declarative
 buildsystem

---
 python-pymapvbvd.rpmlintrc |  4 ++--
 python-pymapvbvd.spec      | 19 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/python-pymapvbvd.rpmlintrc b/python-pymapvbvd.rpmlintrc
index 89c2d18..bab460e 100644
--- a/python-pymapvbvd.rpmlintrc
+++ b/python-pymapvbvd.rpmlintrc
@@ -4,6 +4,6 @@
 addFilter(r" spelling-error \('(dat|twix)',")
 # This source cannot be a URL because we must use a script to download its
 # contents from git-lfs.
-addFilter(r" invalid-url Source[0-9]+: pyMapVBVD-test-data\.tar\.zst$")
+addFilter(r" invalid-url Source[0-9]+: pymapvbvd-test-data\.tar\.zst$")
 # Bogus; it is a perfectly fine zstandard file.
-addFilter(r" inconsistent-file-extension pyMapVBVD-test-data\.tar\.zst$")
+addFilter(r" inconsistent-file-extension pymapvbvd-test-data\.tar\.zst$")
diff --git a/python-pymapvbvd.spec b/python-pymapvbvd.spec
index 50f756e..fbb7b36 100644
--- a/python-pymapvbvd.spec
+++ b/python-pymapvbvd.spec
@@ -14,13 +14,15 @@ Source0:        %{pypi_source pymapvbvd}
 Source1:        pymapvbvd-test-data.tar.zst
 Source2:        get_test_data.sh
 
+BuildSystem:            pyproject
+BuildOption(generate_buildrequires): -x tests
+BuildOption(install):   -l mapvbvd
+
 BuildArch:      noarch
 # PyMapVBVD assumes the platform is little-endian
 # https://bugzilla.redhat.com/show_bug.cgi?id=2225518
 ExcludeArch:    s390x
 
-BuildRequires:  python3-devel
-
 %global common_description %{expand:
 Python port of the Matlab mapVBVD tool for reading Siemens raw data 'twix'
 (.dat) files.}
@@ -49,22 +51,15 @@ Summary:        %{summary}
 rm -v versioneer.py
 
 
-%generate_buildrequires
+%generate_buildrequires -p
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%pyproject_buildrequires -x tests
 
 
-%build
+%build -p
 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
-%pyproject_wheel
 
 
-%install
-%pyproject_install
-%pyproject_save_files -l mapvbvd
-
-
-%check
+%check -a
 %pytest -v
 
 

From 9d25fc900d994a1565675be09fd9bfcbe26d342d Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Tue, 3 Jun 2025 21:16:17 +0200
Subject: [PATCH 25/28] Rebuilt for Python 3.14


From b7c76663215923ea9baa69496ce8475357836bcb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 09:41:20 +0000
Subject: [PATCH 26/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 9057ef303eb34630082ae88fa31ea556570731d8 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 15 Aug 2025 14:32:07 +0200
Subject: [PATCH 27/28] Rebuilt for Python 3.14.0rc2 bytecode


From f78cfa9db250afcb5dd043bcc85460a1b0ae8111 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 19 Sep 2025 14:07:14 +0200
Subject: [PATCH 28/28] Rebuilt for Python 3.14.0rc3 bytecode