diff --git a/cargo.tar.gz b/cargo.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5458dbb03efeaad0893ec2862187fc2118827693 Binary files /dev/null and b/cargo.tar.gz differ diff --git a/librsvg-2.54.4.tar.xz b/librsvg-2.54.4.tar.xz deleted file mode 100644 index 93278181bd1dd8d79a58602d73aa4d970d01a8d1..0000000000000000000000000000000000000000 Binary files a/librsvg-2.54.4.tar.xz and /dev/null differ diff --git a/librsvg-2.55.1.tar.xz b/librsvg-2.55.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..56e5b59b8406f3dd22360d3c96df235a89d62a57 Binary files /dev/null and b/librsvg-2.55.1.tar.xz differ diff --git a/librsvg2.spec b/librsvg2.spec index c5fd598f1c9ccac7ab6ceb8f9a02783cff63d830..4aed9e3f47ae75965933e5a1ed9dee2c4fe746be 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,15 +1,16 @@ -%undefine _strict_symbol_defs_build -%global _configure_disable_silent_rules 1 -%global bundled_rust_deps 1 -%global cairo_version 1.16.0 +%undefine _strict_symbol_defs_build +%global _configure_disable_silent_rules 1 +%global bundled_rust_deps 1 +%global cairo_version 1.16.0 Name: librsvg2 -Version: 2.54.4 +Version: 2.55.1 Release: 1 Summary: An SVG library based on cairo 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.55/librsvg-%{version}.tar.xz +Source1: cargo.tar.gz BuildRequires: chrpath gcc gobject-introspection-devel libxml2-devel gi-docgen BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel make @@ -47,23 +48,22 @@ This package provides extra utilities based on the librsvg library. %package_help %prep +tar xf %{SOURCE1} -C ~/ %autosetup -n librsvg-%{version} -p1 + %if ! 0%{?bundled_rust_deps} rm -vrf vendor .cargo Cargo.lock -pushd rsvg_internals - %cargo_prep - mv .cargo .. -popd +sed -i Makefile.am -e 's/$(CARGO) --locked/$(CARGO)/' +%cargo_prep %endif %if ! 0%{?bundled_rust_deps} %generate_buildrequires -pushd rsvg_internals >/dev/null - %cargo_generate_buildrequires -popd >/dev/null +%cargo_generate_buildrequires %endif %build +#export CARGO="%__cargo" %configure --disable-static \ --disable-gtk-doc \ --docdir=%{_datadir}/doc/%{name} \ @@ -108,6 +108,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md %{_mandir}/man1/*.1* %changelog +* Mon Jan 02 2023 lin zhang - 2.55.1-1 +- Update to 2.55.1 and add cargo compile files + * Sat Jun 25 2022 lin zhang - 2.54.4-1 - Update to 2.54.4