From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 7 Sep 2022 11:52:56 +0000 (+0100)
Subject: Further attempts to libblkio
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d8ed4bfd93855228f8fae2bac1cbe6ca12b314d4;p=fedora-reviews.git

Further attempts to libblkio

See also
https://bugzilla.redhat.com/show_bug.cgi?id=2124697
---

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index bbc631a..702a367 100644
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -8,19 +8,44 @@ Summary:       Block device I/O library
 Name:          libblkio
 Release:       1%{?dist}
 URL:           %{forgeurl}
-Source:        %{forgesource}
+Source0:       %{forgesource}
 License:       ASL 2.0 or MIT
 
+# 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/io-uring
+# vendor/memfd
+# vendor/winapi*
+Source1:       vendor.tar.gz
+
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
 BuildRequires: make
 BuildRequires: meson
-BuildRequires: rust
+BuildRequires: rust-packaging >= 21
 BuildRequires: rustfmt
 BuildRequires: cargo
 BuildRequires: python3-docutils
-BuildRequires: liburing-devel
 BuildRequires: pkgconf
+BuildRequires: crate(autocfg/default)
+BuildRequires: crate(bitflags/default)
+BuildRequires: crate(cc/default)
+BuildRequires: crate(cfg-if/default)
+# BuildRequires: crate(concat-idents...)
+BuildRequires: crate(const-cstr/default)
+# BuildRequires: crate(io-uring...)
+BuildRequires: crate(lazy_static/default)
+BuildRequires: crate(libc/default)
+# BuildRequires: crate(memfd...)
+BuildRequires: crate(memmap/default)
+BuildRequires: crate(memoffset/default)
+BuildRequires: crate(nix/default)
+BuildRequires: crate(proc-macro2/default)
+BuildRequires: crate(syn/default)
+BuildRequires: crate(unicode-xid/default)
+BuildRequires: crate(virtio-bindings/default)
 
 
 %description
@@ -40,6 +65,7 @@ This package contains development tools for %{name}.
 
 %prep
 %forgesetup
+tar zxf %{SOURCE1}
 
 
 %build
diff --git a/libblkio/vendor.tar.gz b/libblkio/vendor.tar.gz
new file mode 100644
index 0000000..c94ea92
Binary files /dev/null and b/libblkio/vendor.tar.gz differ