From 7781160a4a7f3d1e3bec67baf1ba5d15883f3f861d3ddf5d8ecaf808d16313b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 28 Jun 2023 10:10:20 +0000 Subject: [PATCH] Use new rustflags OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/snapshot?expand=0&rev=2 --- snapshot.changes | 6 ++++++ snapshot.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/snapshot.changes b/snapshot.changes index 88daabe..4d7e31d 100644 --- a/snapshot.changes +++ b/snapshot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 28 10:09:30 UTC 2023 - Bjørn Lie + +- Use %build_rustflags instead of the deprecated + %__rustflags macro. Requires at least cargo-packaging 1.2.0+3. + ------------------------------------------------------------------- Fri Mar 31 19:07:56 UTC 2023 - Bjørn Lie diff --git a/snapshot.spec b/snapshot.spec index 59c4d70..c2df7c8 100644 --- a/snapshot.spec +++ b/snapshot.spec @@ -27,7 +27,7 @@ Source2: vendor.tar.zst Source3: cargo_config BuildRequires: appstream-glib -BuildRequires: cargo-packaging +BuildRequires: cargo-packaging >= 1.2.0+3 BuildRequires: desktop-file-utils BuildRequires: libxml2-tools BuildRequires: meson @@ -49,18 +49,18 @@ mkdir .cargo cp %{SOURCE3} .cargo/config %build -export RUSTFLAGS="%{__rustflags}" +export RUSTFLAGS="%{build_rustflags}" %meson %meson_build %install -export RUSTFLAGS="%{__rustflags}" +export RUSTFLAGS="%{build_rustflags}" %meson_install %find_lang %{name} %{?no_lang_C} # Check disabled - no tests are run during cargo_test yet + failing manual tests... #%%check -#export RUSTFLAGS="%%{__rustflags}" +#export RUSTFLAGS="%%{build_rustflags}" #%%{cargo_test} # Checks disabled as they both fail atm :-) - NO FWD to distro atm. #desktop-file-validate %%{buildroot}%%{_datadir}/applications/org.gnome.Snapshot.desktop