Remove memfd bundle

[fedora-reviews.git] / libblkio / libblkio.spec

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index a875bd9..a7c8c47 100644 (file)
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -5,22 +5,13 @@ Version:       1.1.0
 
 Summary:       Block device I/O library
 Name:          libblkio
-Release:       4%{?dist}
+Release:       5%{?dist}
 URL:           %{forgeurl}
 Source0:       %{forgesource}
 License:       ASL 2.0 or MIT
 
 Patch:         0001-Use-io-uring-0.5.8.patch
-
-# Bundled missing dependencies.
-#
-# These were created by running "cargo vendor" in the source tree
-# and then making a tarball of just the following directories:
-# vendor/memfd
-Source1:       vendor.tar.gz
-
-# Bundled dependencies
-Provides:      bundled(crate(memfd/default)) = 0.4.1
+Patch:         0002-virtio-driver-upgrade-to-memfd-0.6.1.patch
 
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
@@ -40,7 +31,7 @@ BuildRequires: crate(const-cstr/default)
 BuildRequires: crate(io-uring/default)
 BuildRequires: crate(lazy_static/default)
 BuildRequires: crate(libc/default)
-# BuildRequires: crate(memfd...)
+BuildRequires: crate(memfd/default)
 BuildRequires: crate(memmap/default)
 BuildRequires: crate(memoffset/default)
 BuildRequires: crate(nix/default)
@@ -70,12 +61,7 @@ This package contains development tools for %{name}.
 
 %prep
 %forgeautosetup -p1
-tar zxf %{SOURCE1}
 
-cat >> Cargo.toml <<EOF
-[patch.crates-io]
-memfd = { path = 'vendor/memfd' }
-EOF
 %cargo_prep
 sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
@@ -104,5 +90,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
 
 %changelog
-* Mon Oct 31 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-4
+* Mon Oct 31 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-5
 - Initial package