From 16ec62112784834105bb883352c28abab96d234d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Sep 29 2023 22:59:29 +0000
Subject: revert changes to %crate_instdir until packages are ready


---

diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo
index fd482b0..a5ae404 100644
--- a/macros.d/macros.cargo
+++ b/macros.d/macros.cargo
@@ -31,9 +31,8 @@
 # crate_instdir: path to the directory where library crates are installed
 #
 # Installed crates are namespaced by both their name and version to ensure
-# parallel installability. If the "crate_version" macro is not defined, the
-# macro falls back to the package "version".
-%crate_instdir %{cargo_registry}/%{crate}-%{?crate_version:%{crate_version}}%{!?crate_version:%{version_no_tilde}}
+# parallel installability.
+%crate_instdir %{cargo_registry}/%{crate}-%{version_no_tilde}
 
 # __cargo_is_lib: function-like macro that returns successfully if the crate in
 #       the current working directory is a "library" crate
diff --git a/tests/test_macros_cargo.py b/tests/test_macros_cargo.py
index ed46305..e02c45c 100644
--- a/tests/test_macros_cargo.py
+++ b/tests/test_macros_cargo.py
@@ -22,10 +22,6 @@ def test_cargo_registry(evaluater):
             "/usr/share/cargo/registry/chrono-0.4.20-rc.1",
         ),
         (
-            {"crate": "chrono", "version": "0.4.20~rc.1", "crate_version": "0.4.20-rc.1"},
-            "/usr/share/cargo/registry/chrono-0.4.20-rc.1",
-        ),
-        (
             {"crate": "tokio", "version": "1.32.0"},
             "/usr/share/cargo/registry/tokio-1.32.0",
         ),