Accepting request 1093230 from GNOME:Next

- Use %__default_rustflags instead of the deprecated %__rustflags
  macro. Requires at least cargo-packaging 1.2.0+2 (boo#1212333).

OBS-URL: https://build.opensuse.org/request/show/1093230
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=235
This commit is contained in:
Ana Guerrero 2023-06-15 14:12:19 +00:00 committed by Git OBS Bridge
parent a099ff842b
commit deee8b69ee
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 14 06:24:36 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %__default_rustflags instead of the deprecated %__rustflags
macro. Requires at least cargo-packaging 1.2.0+2 (boo#1212333).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 31 07:46:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com> Wed May 31 07:46:07 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -31,7 +31,7 @@ Source2: vendor.tar.zst
Source3: cargo_config Source3: cargo_config
Source99: baselibs.conf Source99: baselibs.conf
BuildRequires: cargo-packaging BuildRequires: cargo-packaging >= 1.2.0+2
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -140,7 +140,7 @@ mkdir .cargo
cp %{SOURCE3} .cargo/config cp %{SOURCE3} .cargo/config
%build %build
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{__default_rustflags}"
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
%configure \ %configure \
--disable-static\ --disable-static\
@ -150,14 +150,14 @@ NOCONFIGURE=1 ./autogen.sh
%make_build %make_build
%install %install
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{__default_rustflags}"
%make_install %make_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# %%doc is used to package such contents # %%doc is used to package such contents
rm -rf %{buildroot}%{_datadir}/doc/%{name}/CO*.md rm -rf %{buildroot}%{_datadir}/doc/%{name}/CO*.md
%check %check
export RUSTFLAGS="%{__rustflags}" export RUSTFLAGS="%{__default_rustflags}"
%ifarch x86_64 %{?x86_64} %ifarch x86_64 %{?x86_64}
# 2023-01-15: the pdf-related tests are failing (bsc#1207167) # 2023-01-15: the pdf-related tests are failing (bsc#1207167)
# 2023-03-17 cairo-1.17.8 filter_morphology svg test is failing # 2023-03-17 cairo-1.17.8 filter_morphology svg test is failing