From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 28 Oct 2022 09:10:31 +0000 (+0100)
Subject: Update libblkio
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d82fc5d819d64187fbbf45ae38f0de7706dec408;p=fedora-reviews.git

Update libblkio

Remove bundled num-traits.
Use correct bundle() syntax for cargo crates.

https://bugzilla.redhat.com/show_bug.cgi?id=2124697#c23
---

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index 7f2d3a2..bb13718 100644
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -5,7 +5,7 @@ Version:       1.1.0
 
 Summary:       Block device I/O library
 Name:          libblkio
-Release:       1%{?dist}
+Release:       2%{?dist}
 URL:           %{forgeurl}
 Source0:       %{forgesource}
 License:       ASL 2.0 or MIT
@@ -17,17 +17,15 @@ License:       ASL 2.0 or MIT
 # vendor/concat-idents
 # vendor/io-uring
 # vendor/memfd
-# vendor/num-traits
 # vendor/pci-driver
 # vendor/winapi*
 Source1:       vendor.tar.gz
 
 # Bundled dependencies
-Provides:      bundled(rust-concat-idents)
-Provides:      bundled(rust-io-uring)
-Provides:      bundled(rust-memfd)
-Provides:      bundled(rust-num-traits)
-Provides:      bundled(rust-pci-driver)
+Provides:      bundled(crate(concat-idents/default)) = 1.1.3
+Provides:      bundled(crate(io-uring/default)) = 0.5.6
+Provides:      bundled(crate(memfd/default)) = 0.4.1
+Provides:      bundled(crate(pci-driver/default)) = 0.1.2
 
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
@@ -51,7 +49,7 @@ BuildRequires: crate(libc/default)
 BuildRequires: crate(memmap/default)
 BuildRequires: crate(memoffset/default)
 BuildRequires: crate(nix/default)
-# BuildRequires: crate(num-traits/default)
+BuildRequires: crate(num-traits/default)
 # BuildRequires: crate(pci-driver/default)
 BuildRequires: crate(proc-macro2/default)
 BuildRequires: crate(quote/default)
@@ -84,7 +82,6 @@ cat >> Cargo.toml <<EOF
 concat-idents = { path = 'vendor/concat-idents' }
 io-uring = { path = 'vendor/io-uring' }
 memfd = { path = 'vendor/memfd' }
-num-traits = { path = 'vendor/num-traits' }
 pci-driver = { path = 'vendor/pci-driver' }
 winapi = { path = 'vendor/winapi' }
 winapi-i686-pc-windows-gnu = { path = 'vendor/winapi-i686-pc-windows-gnu' }
@@ -118,5 +115,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
 
 %changelog
-* Wed Oct 26 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
+* Fri Oct 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
 - Initial package
diff --git a/libblkio/vendor.tar.gz b/libblkio/vendor.tar.gz
index 0ec8df7..02689ca 100644
Binary files a/libblkio/vendor.tar.gz and b/libblkio/vendor.tar.gz differ