From bbd07d628787764794d85a4304d224e09f325be1 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 3 May 2025 00:38:51 -0700 Subject: [PATCH] fix(ruffle-nightly): Use %cargo_build instead of %cargo_install (#4628) (#4632) * fix(ruffle-nightly): Use %cargo_build instead of %cargo_install Signed-off-by: Gilver * fix: Not sure what happened there, also remove now unused build dep Signed-off-by: Gilver * Oops...? Signed-off-by: Gilver --------- Signed-off-by: Gilver (cherry picked from commit ec4cb55aa9837240ff015ad015286212d95fc175) Co-authored-by: Gilver --- anda/apps/ruffle/ruffle-nightly.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 43dd8fd366..c6c92be3b8 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -17,7 +17,6 @@ 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) @@ -32,7 +31,7 @@ Packager: madonuko %doc README.md %license LICENSE.md %license LICENSE.dependencies -%_bindir/ruffle_desktop +%_bindir/ruffle %_datadir/applications/rs.ruffle.Ruffle.desktop %_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg %_metainfodir/rs.ruffle.Ruffle.metainfo.xml @@ -40,21 +39,18 @@ Packager: madonuko %prep %autosetup -n ruffle-nightly-%ver -p1 %cargo_prep_online -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 -%{cargo_license_online} > LICENSE.dependencies +cd desktop +%cargo_build %install -cd desktop -%cargo_install -install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg -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 +install -Dm755 target/rpm/ruffle_desktop %buildroot%_bindir/ruffle +install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg +install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop +install -Dm644 desktop/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 +%{cargo_license_online} > LICENSE.dependencies %changelog * Mon Jul 29 2024 madonuko