You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
982 B

From 3df6ad1259c1741656affc26512f81631e9148f5 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Mar 09 2023 20:44:10 +0000
Subject: Correct %__rustc and %__rustdoc paths and docs
%{_bindir} should not be used like this in specfiles or macros. It
breaks flatpak builds.
Also, correct docstring copy-paste errors.
Relates: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies
---
diff --git a/macros.d/macros.rust b/macros.d/macros.rust
index 1978f85..095cebc 100644
--- a/macros.d/macros.rust
+++ b/macros.d/macros.rust
@@ -1,8 +1,8 @@
-# __cargo_to_rpm: path to the default rustc executable
-%__rustc %{_bindir}/rustc
+# __rustc: path to the default rustc executable
+%__rustc /usr/bin/rustc
-# __cargo_to_rpm: path to the default rustdoc executable
-%__rustdoc %{_bindir}/rustdoc
+# __rustdoc: path to the default rustdoc executable
+%__rustdoc /usr/bin/rustdoc
# rustflags_opt_level: default optimization level
#