From bfd5662d37d2c7ff03f7bdfe676b433acbd43ad147e0ec0b4bfbddcfe2629d98 Mon Sep 17 00:00:00 2001 From: Luciano Santos Date: Fri, 30 Jun 2023 18:15:50 +0000 Subject: [PATCH] Accepting request 1095785 from GNOME:Next - Use %build_rustflags instead of the deprecated %__rustflags macro. Requires at least cargo-packaging 1.2.0+3. OBS-URL: https://build.opensuse.org/request/show/1095785 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/loupe?expand=0&rev=6 --- loupe.changes | 6 ++++++ loupe.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/loupe.changes b/loupe.changes index b2bbc8b..ee4c9c7 100644 --- a/loupe.changes +++ b/loupe.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 28 09:49:06 UTC 2023 - Bjørn Lie + +- Use %build_rustflags instead of the deprecated + %__rustflags macro. Requires at least cargo-packaging 1.2.0+3. + ------------------------------------------------------------------- Sun Apr 23 19:02:34 UTC 2023 - Bjørn Lie diff --git a/loupe.spec b/loupe.spec index 0b44540..6e6c30c 100644 --- a/loupe.spec +++ b/loupe.spec @@ -21,7 +21,7 @@ Version: 44.2 Release: 0 Summary: A simple image viewer application License: GPL-3.0-or-later -URL: https://gitlab.gnome.org/Incubator/loupe +URL: https://gitlab.gnome.org/GNOME/Incubator/loupe Source: %{name}-%{version}.tar.xz Source2: vendor.tar.zst Source3: cargo_config @@ -29,7 +29,7 @@ Source3: cargo_config Patch: loupe-revert-gtk4-unstable-bump.patch BuildRequires: appstream-glib -BuildRequires: cargo-packaging +BuildRequires: cargo-packaging >= 1.2.0+3 BuildRequires: desktop-file-utils BuildRequires: meson BuildRequires: pkgconfig @@ -50,18 +50,18 @@ mkdir .cargo cp %{SOURCE3} .cargo/config %build -export RUSTFLAGS="%{__rustflags}" +export RUSTFLAGS="%{build_rustflags}" %meson \ %{nil} %meson_build %install -export RUSTFLAGS="%{__rustflags}" +export RUSTFLAGS="%{build_rustflags}" %meson_install %find_lang %{name} %{?no_lang_C} %check -export RUSTFLAGS="%{__rustflags}" +export RUSTFLAGS="%{build_rustflags}" %cargo_test # No meson_test exsist upstream yet, so run these manually appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Loupe.metainfo.xml