From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 28 Oct 2022 17:07:53 +0000 (+0100)
Subject: Unbundle concat-idents
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a7f0c87af01836733e15c1ad46997677f3360f25;p=fedora-reviews.git

Unbundle concat-idents
---

diff --git a/libblkio/libblkio.spec b/libblkio/libblkio.spec
index 4538b39..9e3d6ff 100644
--- a/libblkio/libblkio.spec
+++ b/libblkio/libblkio.spec
@@ -14,14 +14,12 @@ License:       ASL 2.0 or MIT
 #
 # 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
 
@@ -38,7 +36,7 @@ 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)
@@ -77,7 +75,6 @@ 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' }