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
This commit is contained in:
Luciano Santos 2023-06-30 18:15:50 +00:00 committed by Git OBS Bridge
parent 0e6ef729fa
commit bfd5662d37
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 28 09:49:06 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- 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 <bjorn.lie@gmail.com> Sun Apr 23 19:02:34 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -21,7 +21,7 @@ Version: 44.2
Release: 0 Release: 0
Summary: A simple image viewer application Summary: A simple image viewer application
License: GPL-3.0-or-later 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 Source: %{name}-%{version}.tar.xz
Source2: vendor.tar.zst Source2: vendor.tar.zst
Source3: cargo_config Source3: cargo_config
@ -29,7 +29,7 @@ Source3: cargo_config
Patch: loupe-revert-gtk4-unstable-bump.patch Patch: loupe-revert-gtk4-unstable-bump.patch
BuildRequires: appstream-glib BuildRequires: appstream-glib
BuildRequires: cargo-packaging BuildRequires: cargo-packaging >= 1.2.0+3
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: meson BuildRequires: meson
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -50,18 +50,18 @@ mkdir .cargo
cp %{SOURCE3} .cargo/config cp %{SOURCE3} .cargo/config
%build %build
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{build_rustflags}"
%meson \ %meson \
%{nil} %{nil}
%meson_build %meson_build
%install %install
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{build_rustflags}"
%meson_install %meson_install
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
%check %check
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{build_rustflags}"
%cargo_test %cargo_test
# No meson_test exsist upstream yet, so run these manually # No meson_test exsist upstream yet, so run these manually
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Loupe.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Loupe.metainfo.xml