diff --git a/0001-Fedora-Drop-dependencies-required-for-benchmarking.patch b/0001-Fedora-Drop-dependencies-required-for-benchmarking.patch new file mode 100644 index 0000000000000000000000000000000000000000..bacb0314ae7ad54f47f027dfbfd6e572c8dbb885 --- /dev/null +++ b/0001-Fedora-Drop-dependencies-required-for-benchmarking.patch @@ -0,0 +1,26 @@ +From 54fec1d6f28aac6083643a7c130f9ba59297e9b2 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Tue, 8 Nov 2022 17:02:19 +0100 +Subject: [PATCH] Fedora: Drop dependencies required for benchmarking + +Drop criterion that is only required for benchmarking, which we don't do +during package builds. +--- + Cargo.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index ed4bf8de..1f18ab3e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -90,7 +90,6 @@ assert_cmd = "2.0.2" + cairo-rs = { version = "0.16", features = ["png"] } + cast = "0.3.0" + chrono = "0.4.0" +-criterion = "0.3" + glib = "0.16" + libc = "0.2" + lopdf = "0.29.0" +-- +2.39.2 + diff --git a/cargo.tar.gz b/cargo.tar.gz deleted file mode 100644 index 5458dbb03efeaad0893ec2862187fc2118827693..0000000000000000000000000000000000000000 Binary files a/cargo.tar.gz and /dev/null differ diff --git a/librsvg-2.55.1.tar.xz b/librsvg-2.55.90.tar.xz similarity index 43% rename from librsvg-2.55.1.tar.xz rename to librsvg-2.55.90.tar.xz index 56e5b59b8406f3dd22360d3c96df235a89d62a57..1040fed57d39bb0d22de8175002ca518b5460d9f 100644 Binary files a/librsvg-2.55.1.tar.xz and b/librsvg-2.55.90.tar.xz differ diff --git a/librsvg2.spec b/librsvg2.spec index 4aed9e3f47ae75965933e5a1ed9dee2c4fe746be..1fd8d9c7928b95b8f3ab90b17275a6434e758f6d 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -4,19 +4,19 @@ %global cairo_version 1.16.0 Name: librsvg2 -Version: 2.55.1 +Version: 2.55.90 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.55/librsvg-%{version}.tar.xz -Source1: cargo.tar.gz +Patch: 0001-Fedora-Drop-dependencies-required-for-benchmarking.patch 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: fontconfig-devel gdk-pixbuf2-devel glib2-devel make +BuildRequires: pango-devel vala python3-docutils libxml2-devel +BuildRequires: cairo-gobject-devel >= %{cairo_version} cairo-devel >= %{cairo_version} +%if 0%{?bundled_rust_deps} BuildRequires: cargo BuildRequires: rust %else @@ -48,7 +48,6 @@ 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} @@ -63,7 +62,7 @@ sed -i Makefile.am -e 's/$(CARGO) --locked/$(CARGO)/' %endif %build -#export CARGO="%__cargo" +export CARGO="%__cargo" %configure --disable-static \ --disable-gtk-doc \ --docdir=%{_datadir}/doc/%{name} \ @@ -108,6 +107,9 @@ rm -f %{buildroot}%{_pkgdocdir}/COMPILING.md %{_mandir}/man1/*.1* %changelog +* Tue Mar 14 2023 li-long315 - 2.55.90-1 +- Upgrade to 2.55.90 + * Mon Jan 02 2023 lin zhang - 2.55.1-1 - Update to 2.55.1 and add cargo compile files