From 1d473c54d84ed1561c7f975284ac2525fa5e9491 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 26 Jun 2024 15:34:30 -0700 Subject: [PATCH 1/4] remove unneded debug_package line --- anda/devs/zed-nightly/zed-nightly.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index ba49e6050b..1e09bf3d07 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -4,7 +4,6 @@ %global ver 0.142.0 %bcond_without check -%global debug_package %{nil} %global crate zed %global app_id dev.zed.Zed-Nightly From a03c3b3a69f137c6747ba9d7074bd23c6e505e95 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 26 Jun 2024 16:12:34 -0700 Subject: [PATCH 2/4] use cargo_install macro --- anda/devs/zed-nightly/zed-nightly.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 1e09bf3d07..9cb754dd90 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -69,8 +69,7 @@ echo "nightly" > crates/zed/RELEASE_CHANNEL script/generate-licenses %install -install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor -install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed +%cargo_install install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png From 3df57b88f95a0d63200d625293c00be484a2f2c0 Mon Sep 17 00:00:00 2001 From: "lleyton@fyralabs.com" Date: Wed, 26 Jun 2024 16:57:48 -0700 Subject: [PATCH 3/4] Revert "use cargo_install macro" This reverts commit a03c3b3a69f137c6747ba9d7074bd23c6e505e95. --- anda/devs/zed-nightly/zed-nightly.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 9cb754dd90..1e09bf3d07 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -69,7 +69,8 @@ echo "nightly" > crates/zed/RELEASE_CHANNEL script/generate-licenses %install -%cargo_install +install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png From db7ffe3235ec7683ac68b000a4edd04bcd8a24bf Mon Sep 17 00:00:00 2001 From: "lleyton@fyralabs.com" Date: Wed, 26 Jun 2024 16:58:43 -0700 Subject: [PATCH 4/4] don't mangle sources --- anda/devs/zed-nightly/zed-nightly.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 1e09bf3d07..594e233c84 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -5,6 +5,9 @@ %bcond_without check +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ + %global crate zed %global app_id dev.zed.Zed-Nightly