!36 Update to 2.54.0

From: @weijin-deng 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301

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
+Version:        2.54.0
-Release:        2
+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
+Source0:        https://download.gnome.org/sources/librsvg/2.54/librsvg-%{version}.tar.xz
 
-BuildRequires:  chrpath gcc gobject-introspection-devel cairo-devel libxml2-devel 
+BuildRequires:  chrpath gcc gobject-introspection-devel libxml2-devel gi-docgen
-BuildRequires:  fontconfig-devel gdk-pixbuf2-devel glib2-devel  pkgconfig(cairo-gobject) >= 1.16.0
+BuildRequires:  fontconfig-devel gdk-pixbuf2-devel glib2-devel make
-BuildRequires:  pango-devel vala cargo rust 
+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:       gdk-pixbuf2 cairo >= 1.16.0
+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  \
-%configure --disable-static --disable-gtk-doc --enable-introspection --enable-vala
+           --disable-gtk-doc \
-make
+           --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
+%doc %{_datadir}/doc/%{name}
-%{_datadir}/gtk-doc/html/rsvg-2.0
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 2.54.0-1
+- Update to 2.54.0
+
 * Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.50.5-2
 - DESC: delete -Sgit from %autosetup, and delete BuildRequires git-core