diff --git a/macros b/macros index c69ba73..d9e283d 100644 --- a/macros +++ b/macros @@ -86,15 +86,13 @@ # have not been set already. RPM_OPT_FLAGS and RPM_LD_FLAGS have already # been set implicitly at the start of the %%build section. # LT_SYS_LIBRARY_PATH is used by libtool script. -# RUSTFLAGS is only set when rust-packaging which defines %%{build_rustflags} is -# available. %set_build_flags \ CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \ CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \ FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \ - VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ;%{?build_rustflags: - RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ;} \ + VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ; \ + RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ; \ LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \ LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \ CC="${CC:-%{__cc}}" ; export CC ; \ diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index ffb1e04..ab4192f 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -103,7 +103,8 @@ Requires: perl-srpm-macros # ↓ Has Python BRPs originaly present in redhat-rpm-config Requires: python-srpm-macros >= 3.11-7 Requires: qt5-srpm-macros -Requires: rust-srpm-macros +# rust-srpm-macros v24 contains %%build_rustflags defintion +Requires: rust-srpm-macros >= 24 Requires: rpmautospec-rpm-macros Requires: package-notes-srpm-macros Requires: pyproject-srpm-macros