diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000000000000000000000000000000000000..02369289646870f6c7d21289a01ad26c8983a4ea --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" diff --git a/librsvg-2.56.0.tar.xz b/librsvg-2.56.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..d4308db66b228d1657276d39d2eb42a8c80399fd Binary files /dev/null and b/librsvg-2.56.0.tar.xz differ diff --git a/librsvg2.spec b/librsvg2.spec index f740b11f60b699fec25c4179d2274f76584dd9e5..9987c528eb3fe197c496a8f05636e654faa67f60 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,20 +1,20 @@ %define anolis_release 1 -%undefine _strict_symbol_defs_build - -%global _configure_disable_silent_rules 1 - -%global bundled_rust_deps 1 %global cairo_version 1.16.0 Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.54.5 +Version: 2.56.0 Release: %{anolis_release}%{?dist} License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg -Source0: https://download.gnome.org/sources/librsvg/2.54/librsvg-%{version}.tar.xz +Source0: https://download.gnome.org/sources/librsvg/2.56/librsvg-%{version}.tar.xz +# SOURCE2 generated by: +# cargo vendor +# tar --zstd -cf vendor.tar.zst vendor +Source2: vendor.tar.zst +Source3: cargo_config BuildRequires: chrpath BuildRequires: gcc @@ -34,12 +34,8 @@ BuildRequires: pkgconfig(pangocairo) >= 1.46.0 BuildRequires: pkgconfig(pangoft2) >= 1.46.0 BuildRequires: vala BuildRequires: /usr/bin/rst2man -%if 0%{?bundled_rust_deps} BuildRequires: cargo -BuildRequires: rust -%else -BuildRequires: rust-packaging -%endif +BuildRequires: rust >= 1.64 Requires: cairo >= %{cairo_version} Requires: cairo-gobject >= %{cairo_version} @@ -65,24 +61,9 @@ Requires: %{name} = %{version}-%{release} This package provides extra utilities based on the librsvg library. %prep -%autosetup -n librsvg-%{version} -p1 -%if 0%{?bundled_rust_deps} -# Use the bundled deps -%else -# No bundled deps -rm -vrf vendor .cargo Cargo.lock -pushd rsvg_internals - %cargo_prep - mv .cargo .. -popd -%endif - -%if ! 0%{?bundled_rust_deps} -%generate_buildrequires -pushd rsvg_internals >/dev/null - %cargo_generate_buildrequires -popd >/dev/null -%endif +%autosetup -n librsvg-%{version} -p1 -a2 +mkdir .cargo +cp %{SOURCE3} .cargo/config %build %configure --disable-static \ @@ -94,13 +75,6 @@ popd >/dev/null %install %make_install -# Remove lib64 rpaths -chrpath --delete %{buildroot}%{_bindir}/rsvg-convert -chrpath --delete %{buildroot}%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so - -# Not useful in this package. -rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md - %generate_compatibility_deps %files @@ -132,6 +106,10 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md %{_mandir}/man1/rsvg-convert.1* %changelog +* Wed May 17 2023 Funda Wang - 2.56.0-1 +- New version 2.56.0 +- Build with vendor tarball from openSUSE + * Mon Dec 5 2022 Funda Wang - 2.54.5-1 - New version 2.54.5 diff --git a/librsvg-2.54.5.tar.xz b/vendor.tar.zst similarity index 63% rename from librsvg-2.54.5.tar.xz rename to vendor.tar.zst index a7ab8a2a2b79cb05ede0ac0d3257ffa251f19091..e8e30f103f8f20746eb99c62763719e020862f53 100644 Binary files a/librsvg-2.54.5.tar.xz and b/vendor.tar.zst differ