diff --git a/librsvg-2.50.5.tar.xz b/librsvg-2.54.0.tar.xz similarity index 61% rename from librsvg-2.50.5.tar.xz rename to librsvg-2.54.0.tar.xz index 4f930e35c49e1ef3141be6a7c90bfab03b556f17..b64708b4fe67f0f597da9587f8c68c7b38ec2c05 100644 Binary files a/librsvg-2.50.5.tar.xz and b/librsvg-2.54.0.tar.xz differ diff --git a/librsvg2.spec b/librsvg2.spec index 0b9a076bb60fff6490ee4d5dd534158c11204822..cba334c9c668386f7b93037bb79da7442292925b 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,16 +1,30 @@ +%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.50.5 -Release: 2 +Version: 2.54.0 +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.50/librsvg-%{version}.tar.xz - -BuildRequires: chrpath gcc gobject-introspection-devel cairo-devel libxml2-devel -BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel pkgconfig(cairo-gobject) >= 1.16.0 -BuildRequires: pango-devel vala cargo rust - -Requires: gdk-pixbuf2 cairo >= 1.16.0 +Source0: https://download.gnome.org/sources/librsvg/2.54/librsvg-%{version}.tar.xz + +BuildRequires: chrpath gcc gobject-introspection-devel libxml2-devel gi-docgen +BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel make +BuildRequires: pango-devel vala python3-docutils +BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version} cairo-devel >= %{cairo_version} +%if 0%{?bundled_rust_deps} +BuildRequires: cargo +BuildRequires: rust +%else +BuildRequires: rust-packaging +%endif + +Requires: cairo >= %{cairo_version} +Requires: cairo-gobject >= %{cairo_version} +Requires: gdk-pixbuf2 %description An SVG library based on cairo. @@ -34,24 +48,40 @@ This package provides extra utilities based on the librsvg library. %prep %autosetup -n librsvg-%{version} -p1 +%if ! 0%{?bundled_rust_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 %build -export CFLAGS=$(echo %{?optflags} | sed 's/ -g / /g') -%configure --disable-static --disable-gtk-doc --enable-introspection --enable-vala -make +%configure --disable-static \ + --disable-gtk-doc \ + --docdir=%{_datadir}/doc/%{name} \ + --enable-introspection \ + --enable-vala + +%make_build %install %make_install %delete_la -%find_lang librsvg - chrpath --delete %{buildroot}%{_bindir}/rsvg-convert chrpath --delete %{buildroot}%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so -rm -vrf %{buildroot}%{_datadir}/doc +rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md -%files -f librsvg.lang +%files %defattr(-,root,root) %license COPYING.LIB %{_libdir}/librsvg-2.so.* @@ -66,6 +96,7 @@ rm -vrf %{buildroot}%{_datadir}/doc %{_includedir}/librsvg-2.0/ %{_datadir}/gir-1.0/Rsvg-2.0.gir %{_datadir}/vala/vapi/librsvg-2.0.vapi +%{_datadir}/doc/%{name}/Rsvg-2.0 %files tools %defattr(-,root,root) @@ -73,11 +104,13 @@ rm -vrf %{buildroot}%{_datadir}/doc %files help %defattr(-,root,root) -%doc CONTRIBUTING.md README.md -%{_datadir}/gtk-doc/html/rsvg-2.0 +%doc %{_datadir}/doc/%{name} %{_mandir}/man1/*.1* %changelog +* Mon Mar 28 2022 lin zhang - 2.54.0-1 +- Update to 2.54.0 + * Fri Jul 30 2021 chenyanpanHW - 2.50.5-2 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git-core