From 76c82962cba72e0f0597d69c159c3ef13caae173 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Mon, 28 Jul 2025 18:56:54 -0700 Subject: [PATCH] fix(zed, zed-nightly, zed-preview): Make compatible with ZFS (#5570) (#5970) * fix(zed): Make compatible with ZFS * fix(zed-nightly): Make compatible with ZFS * fix(zed-preview): Make compatible with ZFS * fix(zed-nightly): Change file list too * fix(zed-preview): Change file list too * fix(zed): Change file list too --------- (cherry picked from commit f3cac9144cda69a320003083ef22745515141405) Signed-off-by: Gilver Co-authored-by: Gilver --- anda/devs/zed/nightly/zed-nightly.spec | 27 ++++++++++++++++++++++++-- anda/devs/zed/preview/zed-preview.spec | 27 ++++++++++++++++++++++++-- anda/devs/zed/stable/zed.spec | 27 ++++++++++++++++++++++++-- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 612c977582..8c6dab8f3d 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -16,7 +16,7 @@ Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 1%?dist +Release: 2%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -52,10 +52,33 @@ BuildRequires: perl-lib BuildRequires: rustup %endif BuildRequires: vulkan-loader +Requires: (%name-rename-zeditor if zfs else %name-cli) +Suggests: %name-cli %description Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. +%package cli +Summary: Provides the /usr/bin/zed binary +Conflicts: zfs +Supplements: (%name unless zfs) +%description cli +This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead. +%files cli +%_bindir/zed + +%package rename-zeditor +Summary: Rename zed to zeditor to prevent collision with zfs +Provides: %name-cli +Conflicts: %name-cli +Supplements: (%name and zfs) +%description rename-zeditor +This package provides the %_bindir/zeditor binary instead of %_bindir/zed. This avoids conflicts with the zfs package. +The normal package is %name-cli. +%files rename-zeditor +%_bindir/zeditor + + %prep %autosetup -n %{crate}-%{commit} -p1 %if %{with nightly} @@ -89,6 +112,7 @@ script/generate-licenses %install install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zeditor install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed %__cargo clean @@ -133,7 +157,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts %license LICENSE.themes %license assets/licenses.md %{_libexecdir}/zed-editor -%{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 42ad73a54c..1bbf6d79e9 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -11,7 +11,7 @@ Name: zed-preview Version: %(echo %ver | sed 's/-/~/') -Release: pre2%?dist +Release: 3%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -44,10 +44,33 @@ BuildRequires: perl-File-Compare BuildRequires: perl-File-Copy BuildRequires: perl-lib BuildRequires: vulkan-loader +Requires: (%name-rename-zeditor if zfs else %name-cli) +Suggests: %name-cli %description Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. +%package cli +Summary: Provides the /usr/bin/zed binary +Conflicts: zfs +Supplements: (%name unless zfs) +%description cli +This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead. +%files cli +%_bindir/zed + +%package rename-zeditor +Summary: Rename zed to zeditor to prevent collision with zfs +Provides: %name-cli +Conflicts: %name-cli +Supplements: (%name and zfs) +%description rename-zeditor +This package provides the %_bindir/zeditor binary instead of %_bindir/zed. This avoids conflicts with the zfs package. +The normal package is %name-cli. +%files rename-zeditor +%_bindir/zeditor + + %prep %autosetup -n %{crate}-%{ver} -p1 %cargo_prep_online @@ -78,6 +101,7 @@ script/generate-licenses %install install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zeditor install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed %__cargo clean @@ -122,7 +146,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts %license LICENSE.themes %license assets/licenses.md %{_libexecdir}/zed-editor -%{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 02e552339c..abfa0ff359 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -10,7 +10,7 @@ Name: zed Version: 0.196.6 -Release: 1%?dist +Release: 2%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib @@ -44,10 +44,33 @@ BuildRequires: perl-File-Copy BuildRequires: perl-lib BuildRequires: vulkan-loader BuildRequires: libcurl-devel +Requires: (%name-rename-zeditor if zfs else %name-cli) +Suggests: %name-cli %description Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. +%package cli +Summary: Provides the /usr/bin/zed binary +Conflicts: zfs +Supplements: (%name unless zfs) +%description cli +This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead. +%files cli +%_bindir/zed + +%package rename-zeditor +Summary: Rename zed to zeditor to prevent collision with zfs +Provides: %name-cli +Conflicts: %name-cli +Supplements: (%name and zfs) +%description rename-zeditor +This package provides the %_bindir/zeditor binary instead of %_bindir/zed. This avoids conflicts with the zfs package. +The normal package is %name-cli. +%files rename-zeditor +%_bindir/zeditor + + %prep %autosetup -n %{crate}-%{version} -p1 %cargo_prep_online @@ -78,6 +101,7 @@ script/generate-licenses %install install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zeditor install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed %__cargo clean @@ -122,7 +146,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts %license LICENSE.themes %license assets/licenses.md %{_libexecdir}/zed-editor -%{_bindir}/zed %{_datadir}/applications/%app_id.desktop %{_datadir}/pixmaps/%app_id.png %{_metainfodir}/%app_id.metainfo.xml