From ae68aaa5cc73a19adaafb51a6e7aea13a82b1aec Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Feb 2024 10:39:24 +0100 Subject: [PATCH] Don't use both meson and cargo for building Historically, we didn't get correct RUSTFLAGS when building with meson, but this is now fixed and we can just use meson as usual. --- gnome-tour.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnome-tour.spec b/gnome-tour.spec index cef1c89..51ebed4 100644 --- a/gnome-tour.spec +++ b/gnome-tour.spec @@ -48,7 +48,6 @@ A guided tour and greeter for GNOME. install -p %{SOURCE1} data/resources/assets/welcome.svg %endif -sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build %if 0%{?bundled_rust_deps} %cargo_prep -v vendor %else @@ -65,7 +64,7 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build %build %meson %meson_build -%cargo_build + %cargo_license_summary %{cargo_license} > LICENSE.dependencies %if 0%{?bundled_rust_deps} @@ -75,7 +74,6 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build %install %meson_install -%cargo_install %find_lang gnome-tour @@ -103,6 +101,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des %changelog * Wed Feb 07 2024 Kalev Lember - 45.0-5 - Drop downstream patch that downgraded pretty_env_logger dep to 0.4 +- Don't use both meson and cargo for building * Thu Feb 01 2024 Yaakov Selkowitz - 45.0-4 - Update Rust macro usage