From 0bbf8c867c8995e618ecae62ef2580d5ab6702e5 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 23 Feb 2020 08:32:32 +0100 Subject: [PATCH] Use %cargo_generate_buildrequires for unbundled Rust Signed-off-by: Igor Raits --- librsvg2.spec | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/librsvg2.spec b/librsvg2.spec index d056311..63d7d10 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -42,41 +42,6 @@ BuildRequires: cargo BuildRequires: rust %else BuildRequires: rust-packaging -BuildRequires: (crate(cairo-rs/default) >= 0.5.0 with crate(cairo-rs/default) < 0.6.0) -BuildRequires: (crate(cairo-sys-rs/default) >= 0.7.0 with crate(cairo-sys-rs/default) < 0.8.0) -BuildRequires: (crate(cssparser/default) >= 0.25.1 with crate(cssparser/default) < 0.26.0) -BuildRequires: (crate(data-url/default) >= 0.1.0 with crate(data-url/default) < 0.2.0) -BuildRequires: (crate(downcast-rs/default) >= 1.0.0 with crate(downcast-rs/default) < 2.0.0) -BuildRequires: (crate(encoding/default) >= 0.2.33 with crate(encoding/default) < 0.3.0) -BuildRequires: (crate(float-cmp/default) >= 0.4.0 with crate(float-cmp/default) < 0.5.0) -BuildRequires: (crate(gdk-pixbuf-sys/default) >= 0.7.0 with crate(gdk-pixbuf-sys/default) < 0.8.0) -BuildRequires: (crate(gdk-pixbuf/default) >= 0.5.0 with crate(gdk-pixbuf/default) < 0.6.0) -BuildRequires: (crate(gio-sys/default) >= 0.7.0 with crate(gio-sys/default) < 0.8.0) -BuildRequires: (crate(gio/default) >= 0.5.1 with crate(gio/default) < 0.6.0) -BuildRequires: (crate(gio/v2_48) >= 0.5.1 with crate(gio/v2_48) < 0.6.0) -BuildRequires: (crate(glib-sys/default) >= 0.7.0 with crate(glib-sys/default) < 0.8.0) -BuildRequires: (crate(glib/default) >= 0.6.0 with crate(glib/default) < 0.7.0) -BuildRequires: (crate(gobject-sys/default) >= 0.7.0 with crate(gobject-sys/default) < 0.8.0) -BuildRequires: (crate(itertools/default) >= 0.8.0 with crate(itertools/default) < 0.9.0) -BuildRequires: (crate(language-tags/default) >= 0.2.2 with crate(language-tags/default) < 0.3.0) -BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) -BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) -BuildRequires: (crate(nalgebra/default) >= 0.17.0 with crate(nalgebra/default) < 0.18.0) -BuildRequires: (crate(num-traits/default) >= 0.2.0 with crate(num-traits/default) < 0.3.0) -BuildRequires: (crate(owning_ref/default) >= 0.4.0 with crate(owning_ref/default) < 0.5.0) -BuildRequires: (crate(pango-sys/default) >= 0.7.0 with crate(pango-sys/default) < 0.8.0) -BuildRequires: (crate(pango/default) >= 0.5.0 with crate(pango/default) < 0.6.0) -BuildRequires: (crate(pangocairo/default) >= 0.6.0 with crate(pangocairo/default) < 0.7.0) -BuildRequires: (crate(phf/default) >= 0.7.21 with crate(phf/default) < 0.8.0) -BuildRequires: (crate(phf_codegen/default) >= 0.7.21 with crate(phf_codegen/default) < 0.8.0) -BuildRequires: (crate(rayon/default) >= 1.0.0 with crate(rayon/default) < 2.0.0) -BuildRequires: (crate(regex/default) >= 1.0.0 with crate(regex/default) < 2.0.0) -BuildRequires: (crate(url/default) >= 1.7.2 with crate(url/default) < 2.0.0) -BuildRequires: (crate(xml-rs/default) >= 0.8.0 with crate(xml-rs/default) < 0.9.0) -BuildRequires: crate(locale_config/default) -%if %{with check} -BuildRequires: (crate(criterion/default) >= 0.2.0 with crate(criterion/default) < 0.3.0) -%endif %endif Requires: cairo%{?_isa} >= %{cairo_version} @@ -115,6 +80,13 @@ pushd rsvg_internals popd %endif +%if ! 0%{?bundled_rust_deps} +%generate_buildrequires +pushd rsvg_internals >/dev/null + %cargo_generate_buildrequires +popd >/dev/null +%endif + %build %configure --disable-static \ --disable-gtk-doc \