funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zed*): exec correct binary from .desktop (#6077) (#6110)

Browse Source 
Resolve #6056

(cherry picked from commit 00764f9d7c)

Co-authored-by: madomado <madonuko@outlook.com>
This commit is contained in:
Raboneko
2025-08-22 07:33:03 -07:00
committed by GitHub
parent 2d501eaecf
commit 3519ae1b20
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/devs/zed/nightly/zed-nightly.spec
+5 -2
View File
@@ -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
@@ -66,17 +66,20 @@ Supplements: (%name unless zfs)
This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead.
%files cli
%_bindir/zed
%{_datadir}/applications/%app_id.desktop
%package rename-zeditor
Summary: Rename zed to zeditor to prevent collision with zfs
Provides: %name-cli
Conflicts: %name-cli
Supplements: (%name and zfs)
RemovePathPostFixes: .zeditor
%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
%_datadir/applications/%app_id.desktop.zeditor
%prep
@@ -118,6 +121,7 @@ install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
%__cargo clean
install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
sed 's/Exec=zed/Exec=zeditor/' %app_id.desktop > %app_id.desktop.zeditorinstall -Dm644 %app_id.desktop.zeditor -t %buildroot%_datadir/applications/
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
@@ -157,7 +161,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml
anda/devs/zed/preview/zed-preview.spec
+6 -2
View File
@@ -11,7 +11,7 @@
Name: zed-preview
Version: %(echo %ver | sed 's/-/~/')
Release: 3%?dist
Release: 4%?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
@@ -58,17 +58,20 @@ Supplements: (%name unless zfs)
This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead.
%files cli
%_bindir/zed
%{_datadir}/applications/%app_id.desktop
%package rename-zeditor
Summary: Rename zed to zeditor to prevent collision with zfs
Provides: %name-cli
Conflicts: %name-cli
Supplements: (%name and zfs)
RemovePathPostFixes: .zeditor
%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
%_datadir/applications/%app_id.desktop.zeditor
%prep
@@ -107,6 +110,8 @@ install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
%__cargo clean
install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
sed 's/Exec=zed/Exec=zeditor/' %app_id.desktop > %app_id.desktop.zeditor
install -Dm644 %app_id.desktop.zeditor -t %buildroot%_datadir/applications/
install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
@@ -146,7 +151,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml
anda/devs/zed/stable/zed.spec
+5 -1
View File
@@ -58,17 +58,20 @@ Supplements: (%name unless zfs)
This package provides the /usr/bin/zed binary. If you use zfs, install %name-rename-zeditor instead.
%files cli
%_bindir/zed
%{_datadir}/applications/%app_id.desktop
%package rename-zeditor
Summary: Rename zed to zeditor to prevent collision with zfs
Provides: %name-cli
Conflicts: %name-cli
Supplements: (%name and zfs)
RemovePathPostFixes: .zeditor
%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
%_datadir/applications/%app_id.desktop.zeditor
%prep
@@ -107,6 +110,8 @@ install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
%__cargo clean
install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
sed 's/Exec=zed/Exec=zeditor/' %app_id.desktop > %app_id.desktop.zeditor
install -Dm644 %app_id.desktop.zeditor -t %buildroot%_datadir/applications/
install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
@@ -146,7 +151,6 @@ mv assets/fonts/plex-mono/license.txt LICENSE.fonts
%license LICENSE.themes
%license assets/licenses.md
%{_libexecdir}/zed-editor
%{_datadir}/applications/%app_id.desktop
%{_datadir}/pixmaps/%app_id.png
%{_metainfodir}/%app_id.metainfo.xml