From 56ab30f457e7bf013eeacd5e968c90d075424b69 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Thu, 27 Mar 2025 14:38:39 +0100
Subject: [PATCH] Make installation of shell completions and man pages more
 robust

Without this, OpenScanHub fails to run the install step as it injects
clippy build into the process, which creates different configuration and
therefore different build directory.

Taken from Fedora change

https://src.fedoraproject.org/rpms/rust-sequoia-sq/c/1bcf609430546dc652762d2c7dbdf07926071274

Related: RHEL-84033
---
 rust-sequoia-sq.spec |  9 +++++----
 rust2rpm.toml        | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/rust-sequoia-sq.spec b/rust-sequoia-sq.spec
index f53e64f..f5c0c3d 100644
--- a/rust-sequoia-sq.spec
+++ b/rust-sequoia-sq.spec
@@ -145,6 +145,7 @@ popd
 %endif
 
 %build
+export ASSET_OUT_DIR=target/assets
 %if %{with bundled_capnproto}
 pushd bundled_capnproto
 %cmake -DBUILD_TESTING=OFF
@@ -160,13 +161,13 @@ popd
 %cargo_install
 # install manual pages
 mkdir -p %{buildroot}/%{_mandir}/man1
-cp -pav target/release/build/%{crate}-*/out/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/
+cp -pav target/assets/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/
 # install shell completions
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.bash \
+install -Dpm 0644 target/assets/shell-completions/sq.bash \
     %{buildroot}/%{bash_completions_dir}/sq.bash
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.fish \
+install -Dpm 0644 target/assets/shell-completions/sq.fish \
     %{buildroot}/%{fish_completions_dir}/sq.fish
-install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \
+install -Dpm 0644 target/assets/shell-completions/_sq \
     %{buildroot}/%{zsh_completions_dir}/_sq
 
 %if %{with check}
diff --git a/rust2rpm.toml b/rust2rpm.toml
index dc313e9..5647e95 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -21,16 +21,19 @@ prep.post = [
     "rm -vr subplot/",
     "rm -v tests/sq-subplot.rs",
 ]
+build.pre = [
+    "export ASSET_OUT_DIR=target/assets",
+]
 install.post = [
     "# install manual pages",
     "mkdir -p %{buildroot}/%{_mandir}/man1",
-    "cp -pav target/release/build/%{crate}-*/out/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/",
+    "cp -pav target/assets/man-pages/sq*.1 %{buildroot}/%{_mandir}/man1/",
     "# install shell completions",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.bash \\",
+    "install -Dpm 0644 target/assets/shell-completions/sq.bash \\",
     "    %{buildroot}/%{bash_completions_dir}/sq.bash",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/sq.fish \\",
+    "install -Dpm 0644 target/assets/shell-completions/sq.fish \\",
     "    %{buildroot}/%{fish_completions_dir}/sq.fish",
-    "install -Dpm 0644 target/release/build/%{crate}-*/out/shell-completions/_sq \\",
+    "install -Dpm 0644 target/assets/shell-completions/_sq \\",
     "    %{buildroot}/%{zsh_completions_dir}/_sq",
 ]