From 1ead4d7d8c623f4496e234c32bcd4c0544e529da Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Feb 10 2023 16:52:57 +0000
Subject: use cargo2rpm instead of cargo-inspector in RPM macros


---

diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo
index ccc589e..679e4d4 100644
--- a/macros.d/macros.cargo
+++ b/macros.d/macros.cargo
@@ -6,14 +6,14 @@
 # until it gets stabilized: https://github.com/rust-lang/cargo/issues/5133
 %__cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' %{_bindir}/cargo
 %__cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps
-%__cargo_inspector %{_bindir}/cargo-inspector
+%__cargo_to_rpm %{_bindir}/cargo2rpm
 
 %cargo_registry %{_datadir}/cargo/registry
 
 %crate_instdir %{cargo_registry}/%{crate}-%{version_no_tilde}
 
-%__cargo_is_lib() %__cargo_inspector --target-kinds Cargo.toml | grep -q -F -x "$(printf 'lib\\\nrlib\\\nproc-macro')"
-%__cargo_is_bin() %__cargo_inspector --target-kinds Cargo.toml | grep -q -F -x bin
+%__cargo_is_lib() %{__cargo_to_rpm} is-lib --path Cargo.toml
+%__cargo_is_bin() %{__cargo_to_rpm} is-bin --path Cargo.toml
 
 %cargo_prep (\
 set -eu \
@@ -55,10 +55,11 @@ EOF\
   %{nil}
 }
 
-%cargo_generate_buildrequires(af:) \
-%{__cargo_inspector} -BR %{__cargo_parse_opts %{-a} %{-f:-f%{-f*}}} Cargo.toml \
+%cargo_generate_buildrequires(naf:) \
 %if %{with check} \
-  %{__cargo_inspector} -TR Cargo.toml \
+%{__cargo_to_rpm} --path Cargo.toml buildrequires %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} --with-check \
+%else
+%{__cargo_to_rpm} --path Cargo.toml buildrequires %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
 %endif
 
 %cargo_build(naf:) \
@@ -83,8 +84,8 @@ EOF\
 %cargo_install(t:naf:) (                                            \
 set -eu                                                             \
 if %__cargo_is_lib; then                                            \
-  CRATE_NAME=$(%__cargo_inspector --name Cargo.toml)                \
-  CRATE_VERSION=$(%__cargo_inspector --version Cargo.toml)          \
+  CRATE_NAME=$(%{__cargo_to_rpm} --path Cargo.toml name)            \
+  CRATE_VERSION=$(%{__cargo_to_rpm} --path Cargo.toml version)      \
   REG_DIR=%{buildroot}%{cargo_registry}/$CRATE_NAME-$CRATE_VERSION  \
   %{__mkdir} -p $REG_DIR                                            \
 # Drop all dependency/features information                          \