refactor(ruffle, heroic): Use desktop-file-utils to more safely edit .desktop files (#4568) (#4586)

* refactor(ruffle-nightly): Use desktop-file-utils to more safely edit the .desktop file

Signed-off-by: Gilver <rockgrub@disroot.org>

* refactor(heroic): Use desktop-file-utils to more safely edit the desktop file, rename some things to edit the desktop file less

Signed-off-by: Gilver <rockgrub@disroot.org>

* fix(heroic): Also rename files section

Signed-off-by: Gilver <rockgrub@disroot.org>

* refactor(heroic): Make the entry more similar to the original

Signed-off-by: Gilver <rockgrub@disroot.org>

---------

Signed-off-by: Gilver <rockgrub@disroot.org>
(cherry picked from commit 214328b26a)

Co-authored-by: Gilver <rockgrub@disroot.org>
This commit is contained in:
Raboneko
2025-04-30 22:30:43 -07:00
committed by GitHub
parent 0c2fdb25d0
commit 004bdb1abf
2 changed files with 27 additions and 25 deletions
+6 -2
View File
@@ -9,7 +9,7 @@ language. Ruffle targets both the desktop and the web using WebAssembly.}
Name: ruffle-nightly
Version: %goodver
Release: 1%?dist
Release: 2%?dist
Summary: A Flash Player emulator written in Rust
License: Apache-2.0 OR MIT
URL: https://ruffle.rs/
@@ -17,6 +17,7 @@ Source0: https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%v
Provides: ruffle
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros mold
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++ cmake java
BuildRequires: java-latest-openjdk-headless
BuildRequires: pkgconfig(alsa)
@@ -39,7 +40,7 @@ Packager: madonuko <mado@fyralabs.com>
%prep
%autosetup -n ruffle-nightly-%ver -p1
%cargo_prep_online
sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
desktop-file-edit --set-key=Exec --set-value="ruffle_desktop %u" desktop/packages/linux/rs.ruffle.Ruffle.desktop
cat desktop/packages/linux/rs.ruffle.Ruffle.desktop
%build
@@ -52,6 +53,9 @@ install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/
install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
%check
desktop-file-validate %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
%changelog
* Mon Jul 29 2024 madonuko <mado@fyralabs.com>
- Initial package
@@ -17,7 +17,7 @@
Name: %{shortname}-games-launcher
Version: 2.16.1
Release: 3%?dist
Release: 4%?dist
Summary: A games launcher for GOG, Amazon, and Epic Games
License: GPL-3.0-only AND MIT AND BSD-3-Clause
URL: https://heroicgameslauncher.com
@@ -31,7 +31,6 @@ BuildRequires: make
BuildRequires: nodejs
BuildRequires: pnpm
BuildRequires: python3
BuildRequires: sed
Requires: alsa-lib
Requires: gtk3
Requires: hicolor-icon-theme
@@ -52,8 +51,7 @@ Heroic is a Free and Open Source Epic, GOG, and Amazon Prime Games launcher for
%prep
%git_clone https://github.com/%{org_name}/%{git_name} v%{version}
sed -i 's/Exec=.*%u/Exec=\/usr\/share\/%{shortname}\/%{shortname} %U/g' flatpak/%{reverse_dns}.desktop
sed -i 's/Icon=.*/Icon=%{shortname}/g' flatpak/%{reverse_dns}.desktop
desktop-file-edit --set-key=Exec --set-value="/usr/share/%{shortname}/%{shortname} %u" flatpak/%{reverse_dns}.desktop
%build
pnpm install
@@ -78,18 +76,18 @@ mkdir -p %{buildroot}%{_bindir}
# Make names executable
ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{name}
ln -sr %{_datadir}/%{shortname}/%{shortname} %{buildroot}%{_bindir}/%{shortname}
install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png
install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png
install -Dm644 flatpak/%{reverse_dns}.desktop %{buildroot}%{_datadir}/applications/%{shortname}.desktop
install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_32x32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_64x64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_128x128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_256x256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_512x512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png
install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png
install -Dm644 flatpak/%{reverse_dns}.desktop -t %{buildroot}%{_datadir}/applications/
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/%{reverse_dns}.desktop
%files
%doc README.md
@@ -103,15 +101,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop
%{_datadir}/%{shortname}/*
%{_bindir}/%{shortname}
%{_bindir}/%{name}
%{_datadir}/applications/%{shortname}.desktop
%{_iconsdir}/hicolor/16x16/apps/%{shortname}.png
%{_iconsdir}/hicolor/32x32/apps/%{shortname}.png
%{_iconsdir}/hicolor/48x48/apps/%{shortname}.png
%{_iconsdir}/hicolor/64x64/apps/%{shortname}.png
%{_iconsdir}/hicolor/128x128/apps/%{shortname}.png
%{_iconsdir}/hicolor/256x256/apps/%{shortname}.png
%{_iconsdir}/hicolor/512x512/apps/%{shortname}.png
%{_iconsdir}/hicolor/1024x1024/apps/%{shortname}.png
%{_datadir}/applications/%{reverse_dns}.desktop
%{_iconsdir}/hicolor/16x16/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/32x32/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/48x48/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/64x64/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/128x128/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/256x256/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/512x512/apps/%{reverse_dns}.png
%{_iconsdir}/hicolor/1024x1024/apps/%{reverse_dns}.png
%changelog
* Sun Mar 02 2025 Gilver E. <rockgrub@disroot.org>