Don't use both meson and cargo for building
Historically, we didn't get correct RUSTFLAGS when building with meson, but this is now fixed and we can just use meson as usual.
This commit is contained in:
parent
009bf843dd
commit
ae68aaa5cc
@ -48,7 +48,6 @@ A guided tour and greeter for GNOME.
|
||||
install -p %{SOURCE1} data/resources/assets/welcome.svg
|
||||
%endif
|
||||
|
||||
sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
|
||||
%if 0%{?bundled_rust_deps}
|
||||
%cargo_prep -v vendor
|
||||
%else
|
||||
@ -65,7 +64,7 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
%cargo_build
|
||||
|
||||
%cargo_license_summary
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
%if 0%{?bundled_rust_deps}
|
||||
@ -75,7 +74,6 @@ sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
%cargo_install
|
||||
|
||||
%find_lang gnome-tour
|
||||
|
||||
@ -103,6 +101,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des
|
||||
%changelog
|
||||
* Wed Feb 07 2024 Kalev Lember <klember@redhat.com> - 45.0-5
|
||||
- Drop downstream patch that downgraded pretty_env_logger dep to 0.4
|
||||
- Don't use both meson and cargo for building
|
||||
|
||||
* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 45.0-4
|
||||
- Update Rust macro usage
|
||||
|
Loading…
Reference in New Issue
Block a user