From 6110f2e8cfb5e923d8c17d98030372f1acf6e611 Mon Sep 17 00:00:00 2001 From: june-fish Date: Fri, 14 Jun 2024 20:52:03 -0700 Subject: [PATCH 01/20] wip --- anda/devs/zed-nightly/anda.hcl | 8 ++ anda/devs/zed-nightly/update.rhai | 8 ++ anda/devs/zed-nightly/zed-nightly.desktop | 14 ++++ anda/devs/zed-nightly/zed-nightly.spec | 97 +++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 anda/devs/zed-nightly/anda.hcl create mode 100644 anda/devs/zed-nightly/update.rhai create mode 100644 anda/devs/zed-nightly/zed-nightly.desktop create mode 100644 anda/devs/zed-nightly/zed-nightly.spec diff --git a/anda/devs/zed-nightly/anda.hcl b/anda/devs/zed-nightly/anda.hcl new file mode 100644 index 0000000000..89cdf6e037 --- /dev/null +++ b/anda/devs/zed-nightly/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "zed-nightly.spec" + } + labels { + nightly = 1 + } +} diff --git a/anda/devs/zed-nightly/update.rhai b/anda/devs/zed-nightly/update.rhai new file mode 100644 index 0000000000..781d55ee01 --- /dev/null +++ b/anda/devs/zed-nightly/update.rhai @@ -0,0 +1,8 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("zed-industries/zed")); + if rpm.changed() { + rpm.global("ver", gh("zed-industries/zed")); + rpm.global("commit_date", date()); + rpm.release(); + } +} diff --git a/anda/devs/zed-nightly/zed-nightly.desktop b/anda/devs/zed-nightly/zed-nightly.desktop new file mode 100644 index 0000000000..bc4e11fa08 --- /dev/null +++ b/anda/devs/zed-nightly/zed-nightly.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Zed Nightly +GenericName=Text Editor +Comment=A high-performance, multiplayer code editor. +TryExec=/usr/bin/zed +StartupNotify=true +StartupWMClass=dev.zed.Zed-Nightly +Exec=/usr/bin/zed %F +Icon=zed-nightly +Categories=Utility;TextEditor;Development;IDE; +Keywords=zed; +MimeType=text/plain;inode/directory; diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec new file mode 100644 index 0000000000..a239ee2466 --- /dev/null +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -0,0 +1,97 @@ +%global commit 64bb79b71dc2b70b627a264c9b63ea1a8c8dc524 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240613 +%global ver v0.56.0 + +%bcond_without check +%global debug_package %{nil} + +%global crate zed +%global app_id dev.zed.Zed-Nightly + +Name: zed-nightly +Version: %ver^%commit_date.%shortcommit +Release: 1%?dist +Summary: Zed is a high-performance, multiplayer code editor + +License: MIT +URL: https://zed.dev/ +Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip +# Source1: zed-nightly.desktop + +Conflicts: zed +Provides: zed + +BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: clang +BuildRequires: mold +BuildRequires: alsa-lib-devel +BuildRequires: fontconfig-devel +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +BuildRequires: libzstd-devel +BuildRequires: perl-FindBin +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-lib +BuildRequires: vulkan-loader + +%description +Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. + +%prep +%autosetup -n %{crate}-%{commit} -p1 +%cargo_prep_online + +export DO_STARTUP_NOTIFY="true" +export APP_ID="%app_id" +export APP_ICON="%app_id" +export APP_NAME="Zed Nightly" +export APP_CLI="zed" +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." +export ZED_RELEASE_CHANNEL=nightly +export BRANDING_LIGHT="#e9aa6a" +export BRANDING_DARK="#1a5fb4" + +echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in +envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52 + +envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml + +%build +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." + +echo "nightly" > crates/zed/RELEASE_CHANNEL + +cargo build --release --frozen --package zed --package cli +script/generate-licenses + +%install +install -Dm755 target/release/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/release/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 + +install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml + +%if %{with check} +%check +%cargo_test +%endif + +%files +%{_libexecdir}/zed-editor +%{_bindir}/zed +%{_datadir}/applications/%app_id.desktop +%{_datadir}/pixmaps/%app_id.png +%{_metainfodir}/%app_id.metainfo.xml +%license assets/licenses.md + +%changelog +%autochangelog From a96bf66012a61e4d74a14ea1d2f80d6e5e17c93b Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 19 Jun 2024 19:12:44 -0700 Subject: [PATCH 02/20] remove old desktop file --- anda/devs/zed-nightly/zed-nightly.desktop | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 anda/devs/zed-nightly/zed-nightly.desktop diff --git a/anda/devs/zed-nightly/zed-nightly.desktop b/anda/devs/zed-nightly/zed-nightly.desktop deleted file mode 100644 index bc4e11fa08..0000000000 --- a/anda/devs/zed-nightly/zed-nightly.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Zed Nightly -GenericName=Text Editor -Comment=A high-performance, multiplayer code editor. -TryExec=/usr/bin/zed -StartupNotify=true -StartupWMClass=dev.zed.Zed-Nightly -Exec=/usr/bin/zed %F -Icon=zed-nightly -Categories=Utility;TextEditor;Development;IDE; -Keywords=zed; -MimeType=text/plain;inode/directory; From d5875aac1438a0731dffb8f2b01a47333194969f Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 19 Jun 2024 19:28:39 -0700 Subject: [PATCH 03/20] remove --frozen from build --- anda/devs/zed-nightly/zed-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index a239ee2466..d37dbb8b7e 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -68,7 +68,7 @@ export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." echo "nightly" > crates/zed/RELEASE_CHANNEL -cargo build --release --frozen --package zed --package cli +cargo build --release --package zed --package cli script/generate-licenses %install From ec42607ec398a8482ff7722f706df35efbb3531b Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 19 Jun 2024 19:57:02 -0700 Subject: [PATCH 04/20] bump commit and use correct version --- anda/devs/zed-nightly/zed-nightly.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index d37dbb8b7e..4473a2ed29 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -1,7 +1,7 @@ -%global commit 64bb79b71dc2b70b627a264c9b63ea1a8c8dc524 +%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240613 -%global ver v0.56.0 +%global commit_date 20240619 +%global ver v0.142.0 %bcond_without check %global debug_package %{nil} @@ -17,7 +17,6 @@ Summary: Zed is a high-performance, multiplayer code editor License: MIT URL: https://zed.dev/ Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip -# Source1: zed-nightly.desktop Conflicts: zed Provides: zed From a7eed9817a5073901d56cf089439ad60ca7afd82 Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 19 Jun 2024 20:38:52 -0700 Subject: [PATCH 05/20] check Cargo.toml for version --- anda/devs/zed-nightly/update.rhai | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/anda/devs/zed-nightly/update.rhai b/anda/devs/zed-nightly/update.rhai index 781d55ee01..ac2e45147e 100644 --- a/anda/devs/zed-nightly/update.rhai +++ b/anda/devs/zed-nightly/update.rhai @@ -1,8 +1,9 @@ if filters.contains("nightly") { - rpm.global("commit", gh_commit("zed-industries/zed")); - if rpm.changed() { - rpm.global("ver", gh("zed-industries/zed")); - rpm.global("commit_date", date()); - rpm.release(); - } + rpm.global("commit", gh_commit("zed-industries/zed")); + if rpm.changed() { + let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1); + rpm.global("ver", v); + rpm.global("commit_date", date()); + rpm.release(); + } } From 8d9fe0c012072fd11d1c9dc89c180f1b2bed9717 Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 19 Jun 2024 20:42:43 -0700 Subject: [PATCH 06/20] fix spacing in anda.hcl --- anda/devs/zed-nightly/anda.hcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/devs/zed-nightly/anda.hcl b/anda/devs/zed-nightly/anda.hcl index 89cdf6e037..d8f39ce7e0 100644 --- a/anda/devs/zed-nightly/anda.hcl +++ b/anda/devs/zed-nightly/anda.hcl @@ -1,7 +1,7 @@ project pkg { - rpm { - spec = "zed-nightly.spec" - } + rpm { + spec = "zed-nightly.spec" + } labels { nightly = 1 } From 6fafea3c51d1fc7e2347830e850cd24107107fac Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Mon, 24 Jun 2024 02:02:09 +0700 Subject: [PATCH 07/20] slow down zed build --- anda/devs/zed-nightly/zed-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 4473a2ed29..f12d01ca5f 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -64,7 +64,7 @@ envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo %build export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." - +export CARGO_BUILD_JOBS=1 # Slow down build to avoid OOM echo "nightly" > crates/zed/RELEASE_CHANNEL cargo build --release --package zed --package cli From d19411a349050436f77e0456a7b30737d41ca91d Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Mon, 24 Jun 2024 02:33:47 +0700 Subject: [PATCH 08/20] run with 4 jobs --- anda/devs/zed-nightly/zed-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index f12d01ca5f..6d08912bd6 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -64,7 +64,7 @@ envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo %build export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." -export CARGO_BUILD_JOBS=1 # Slow down build to avoid OOM +export CARGO_BUILD_JOBS=4 # Slow down build to avoid OOM echo "nightly" > crates/zed/RELEASE_CHANNEL cargo build --release --package zed --package cli From b657a7bda7445aa7f913f462128204c7fbece7ec Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 23 Jun 2024 22:01:43 -0700 Subject: [PATCH 09/20] zed-nightly(anda): tag as large --- anda/devs/zed-nightly/anda.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/devs/zed-nightly/anda.hcl b/anda/devs/zed-nightly/anda.hcl index d8f39ce7e0..e92820997f 100644 --- a/anda/devs/zed-nightly/anda.hcl +++ b/anda/devs/zed-nightly/anda.hcl @@ -4,5 +4,6 @@ project pkg { } labels { nightly = 1 + large = 1 } } From a638d9184399f028edebfd4875aa9c0f725af841 Mon Sep 17 00:00:00 2001 From: "lleyton@fyralabs.com" Date: Mon, 24 Jun 2024 11:49:59 -0700 Subject: [PATCH 10/20] ci: if package is labelled as large, use lg runners for x86 --- .github/workflows/autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 567772bef3..f04a5e48ae 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -42,7 +42,7 @@ jobs: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} version: ["40"] fail-fast: false - runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version}} options: --cap-add=SYS_ADMIN --privileged From 9ac28746c7bf830f2342a0bdd1f607570d94ac50 Mon Sep 17 00:00:00 2001 From: "lleyton@fyralabs.com" Date: Mon, 24 Jun 2024 11:51:22 -0700 Subject: [PATCH 11/20] don't slow down build --- 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 6d08912bd6..055edc911d 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -64,7 +64,6 @@ envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo %build export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." -export CARGO_BUILD_JOBS=4 # Slow down build to avoid OOM echo "nightly" > crates/zed/RELEASE_CHANNEL cargo build --release --package zed --package cli From 94077da092d60e6a4f5bb59e0f7f27f796c67b8e Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:41:13 -0700 Subject: [PATCH 12/20] Update zed-nightly.spec Signed-off-by: june <159748074+june-fish@users.noreply.github.com> --- anda/devs/zed-nightly/zed-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 055edc911d..3334e2f075 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -1,7 +1,7 @@ %global commit 0129d4e2506d5ec5e50ef0968382770b9abec390 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date 20240619 -%global ver v0.142.0 +%global ver 0.142.0 %bcond_without check %global debug_package %{nil} From c01edf77e2812976b40749417acb25e2edfcc576 Mon Sep 17 00:00:00 2001 From: june <159748074+june-fish@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:43:52 -0700 Subject: [PATCH 13/20] Update zed-nightly.spec Signed-off-by: june <159748074+june-fish@users.noreply.github.com> --- 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 3334e2f075..970afbd745 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -45,7 +45,6 @@ Code at the speed of thought - Zed is a high-performance, multiplayer code edito %prep %autosetup -n %{crate}-%{commit} -p1 -%cargo_prep_online export DO_STARTUP_NOTIFY="true" export APP_ID="%app_id" From 5269f45e271140d37d5a8ea55d7a863ddb4fce14 Mon Sep 17 00:00:00 2001 From: lea Date: Mon, 24 Jun 2024 19:59:29 -0700 Subject: [PATCH 14/20] use rpm profile --- 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 970afbd745..493ca10dba 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -45,6 +45,7 @@ Code at the speed of thought - Zed is a high-performance, multiplayer code edito %prep %autosetup -n %{crate}-%{commit} -p1 +%cargo_prep_online export DO_STARTUP_NOTIFY="true" export APP_ID="%app_id" @@ -65,7 +66,7 @@ envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." echo "nightly" > crates/zed/RELEASE_CHANNEL -cargo build --release --package zed --package cli +%cargo_build -- --package zed --package cli script/generate-licenses %install From 5cd00e54e674f1548af26c14214374050d53ece7 Mon Sep 17 00:00:00 2001 From: june-fish Date: Mon, 24 Jun 2024 22:21:00 -0700 Subject: [PATCH 15/20] use correct paths for installing zed binaries --- anda/devs/zed-nightly/zed-nightly.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed-nightly/zed-nightly.spec index 493ca10dba..ba49e6050b 100644 --- a/anda/devs/zed-nightly/zed-nightly.spec +++ b/anda/devs/zed-nightly/zed-nightly.spec @@ -70,8 +70,8 @@ echo "nightly" > crates/zed/RELEASE_CHANNEL script/generate-licenses %install -install -Dm755 target/release/zed %{buildroot}%{_libexecdir}/zed-editor -install -Dm755 target/release/cli %{buildroot}%{_bindir}/zed +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 1d473c54d84ed1561c7f975284ac2525fa5e9491 Mon Sep 17 00:00:00 2001 From: lea Date: Wed, 26 Jun 2024 15:34:30 -0700 Subject: [PATCH 16/20] 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 17/20] 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 18/20] 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 19/20] 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 From b493c1116eb5729a5ff7af79ab9030f665b2575b Mon Sep 17 00:00:00 2001 From: june-fish Date: Wed, 26 Jun 2024 20:59:22 -0700 Subject: [PATCH 20/20] reorganize zed to prepare for multiple packages --- anda/devs/{zed-nightly => zed/nightly}/anda.hcl | 0 anda/devs/{zed-nightly => zed/nightly}/update.rhai | 0 anda/devs/{zed-nightly => zed/nightly}/zed-nightly.spec | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename anda/devs/{zed-nightly => zed/nightly}/anda.hcl (100%) rename anda/devs/{zed-nightly => zed/nightly}/update.rhai (100%) rename anda/devs/{zed-nightly => zed/nightly}/zed-nightly.spec (100%) diff --git a/anda/devs/zed-nightly/anda.hcl b/anda/devs/zed/nightly/anda.hcl similarity index 100% rename from anda/devs/zed-nightly/anda.hcl rename to anda/devs/zed/nightly/anda.hcl diff --git a/anda/devs/zed-nightly/update.rhai b/anda/devs/zed/nightly/update.rhai similarity index 100% rename from anda/devs/zed-nightly/update.rhai rename to anda/devs/zed/nightly/update.rhai diff --git a/anda/devs/zed-nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec similarity index 100% rename from anda/devs/zed-nightly/zed-nightly.spec rename to anda/devs/zed/nightly/zed-nightly.spec