Remove memfd bundle

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

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index 4538b39..a7c8c47 100644 (file)
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -5,25 +5,13 @@ Version:       1.1.0
 
 Summary:       Block device I/O library
 Name:          libblkio
-Release:       2%{?dist}
+Release:       5%{?dist}
 URL:           %{forgeurl}
 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/concat-idents
-# vendor/memfd
-# vendor/pci-driver
-# vendor/winapi*
-Source1:       vendor.tar.gz
-
-# Bundled dependencies
-Provides:      bundled(crate(concat-idents/default)) = 1.1.3
-Provides:      bundled(crate(memfd/default)) = 0.4.1
-Provides:      bundled(crate(pci-driver/default)) = 0.1.2
+Patch:         0001-Use-io-uring-0.5.8.patch
+Patch:         0002-virtio-driver-upgrade-to-memfd-0.6.1.patch
 
 # Basic build requirements.
 BuildRequires: gcc, gcc-c++
@@ -38,17 +26,17 @@ BuildRequires: crate(autocfg/default)
 BuildRequires: crate(bitflags/default)
 BuildRequires: crate(cc/default)
 BuildRequires: crate(cfg-if/default)
-# BuildRequires: crate(concat-idents...)
+BuildRequires: crate(concat-idents/default)
 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)
 BuildRequires: crate(num-traits/default)
-# BuildRequires: crate(pci-driver/default)
+BuildRequires: crate(pci-driver/default)
 BuildRequires: crate(proc-macro2/default)
 BuildRequires: crate(quote/default)
 BuildRequires: crate(syn/default)
@@ -72,18 +60,8 @@ This package contains development tools for %{name}.
 
 
 %prep
-%forgesetup
-tar zxf %{SOURCE1}
-
-cat >> Cargo.toml <<EOF
-[patch.crates-io]
-concat-idents = { path = 'vendor/concat-idents' }
-memfd = { path = 'vendor/memfd' }
-pci-driver = { path = 'vendor/pci-driver' }
-winapi = { path = 'vendor/winapi' }
-winapi-i686-pc-windows-gnu = { path = 'vendor/winapi-i686-pc-windows-gnu' }
-winapi-x86_64-pc-windows-gnu = { path = 'vendor/winapi-x86_64-pc-windows-gnu' }
-EOF
+%forgeautosetup -p1
+
 %cargo_prep
 sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
@@ -112,5 +90,5 @@ sed -e 's/--locked/--offline/' -i src/cargo-build.sh
 
 
 %changelog
-* Fri Oct 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
+* Mon Oct 31 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-5
 - Initial package