From e55e5fe21b5c90ba79cbf777549de58ae91b79d9364685b614c45650d86155cf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 13:56:33 +0000 Subject: [PATCH 1/3] Accepting request 581250 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581250 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=121 --- librsvg.changes | 5 +++++ librsvg.spec | 47 +++++++++++++++++++++-------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/librsvg.changes b/librsvg.changes index a219bed..776e637 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:36:14 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Fri Feb 2 09:16:12 UTC 2018 - bjorn.lie@gmail.com diff --git a/librsvg.spec b/librsvg.spec index 0a461a6..3079fb9 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -22,17 +22,15 @@ Release: 0 Summary: A Library for Rendering SVG Data License: LGPL-2.0+ AND GPL-2.0+ Group: Development/Libraries/C and C++ -Url: https://wiki.gnome.org/Projects/LibRsvg +URL: https://wiki.gnome.org/Projects/LibRsvg Source: http://download.gnome.org/sources/librsvg/2.42/%{name}-%{version}.tar.xz Source99: baselibs.conf - BuildRequires: cargo BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig BuildRequires: rust BuildRequires: rust-std BuildRequires: vala -# Avoid cycle: we do not require the adwaita-icon-theme to be present. libgtk-3.0 requires this for end users -#!BuildIgnore: adwaita-icon-theme BuildRequires: pkgconfig(cairo) >= 1.2.0 BuildRequires: pkgconfig(cairo-png) >= 1.2.0 BuildRequires: pkgconfig(fontconfig) @@ -47,6 +45,8 @@ BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0 BuildRequires: pkgconfig(pangocairo) >= 1.38.0 BuildRequires: pkgconfig(pangoft2) >= 1.38.0 +# Avoid cycle: we do not require the adwaita-icon-theme to be present. libgtk-3.0 requires this for end users +#!BuildIgnore: adwaita-icon-theme %description This package contains a library to render SVG (scalable vector @@ -56,16 +56,16 @@ http://www.w3c.org). %package -n librsvg-2-2 Summary: A Library for Rendering SVG Data # bug437293 -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: System/Libraries -%ifarch ppc64 -Obsoletes: librsvg-64bit -%endif # Provides: librsvg2 = %{version} Obsoletes: librsvg2 < %{version} Provides: librsvg = %{version} Obsoletes: librsvg < %{version} +%ifarch ppc64 +Obsoletes: librsvg-64bit +%endif %description -n librsvg-2-2 This package contains a library to render SVG (scalable vector @@ -74,7 +74,7 @@ http://www.w3c.org). %package -n typelib-1_0-Rsvg-2_0 Summary: Introspection bindings for librsvg, a SVG render library -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: System/Libraries %description -n typelib-1_0-Rsvg-2_0 @@ -86,16 +86,12 @@ This package provides the GObject Introspection bindings for librsvg. %package devel Summary: Development files for librsvg, a SVG render library -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ -Provides: librsvg2-devel = %{version} -Obsoletes: librsvg2-devel < %{version} Requires: librsvg-2-2 = %{version} Requires: typelib-1_0-Rsvg-2_0 = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: librsvg-devel-64bit -%endif +Provides: librsvg2-devel = %{version} +Obsoletes: librsvg2-devel < %{version} # %description devel @@ -104,10 +100,10 @@ to develop applications that require these. %package -n gdk-pixbuf-loader-rsvg Summary: A gdk-pixbuf loader for SVG using librsvg -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: System/Libraries Supplements: packageand(librsvg-2-2:gdk-pixbuf) -%gdk_pixbuf_loader_requires +%{gdk_pixbuf_loader_requires} %description -n gdk-pixbuf-loader-rsvg This package contains a library to render SVG (scalable vector @@ -118,7 +114,7 @@ This package provides a librsvg-based gdk-pixbuf loader. %package -n rsvg-view Summary: SVG View using the GNOME Render SVG library -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Productivity/Graphics/Viewers %description -n rsvg-view @@ -128,7 +124,7 @@ http://www.w3c.org). %package -n rsvg-thumbnailer Summary: SVG thumbnailer using the GNOME Render SVG library -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Productivity/Graphics/Other BuildArch: noarch @@ -153,17 +149,16 @@ find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}%{_datadir}/doc/%{name} %post -n librsvg-2-2 -p /sbin/ldconfig - %post -n gdk-pixbuf-loader-rsvg -%gdk_pixbuf_loader_post +%{gdk_pixbuf_loader_post} %postun -n librsvg-2-2 -p /sbin/ldconfig - %postun -n gdk-pixbuf-loader-rsvg -%gdk_pixbuf_loader_postun +%{gdk_pixbuf_loader_postun} %files -n librsvg-2-2 -%doc COPYING.LIB NEWS README.md +%license COPYING.LIB +%doc NEWS README.md %{_libdir}/librsvg-2.so.* %files -n typelib-1_0-Rsvg-2_0 @@ -176,7 +171,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %license COPYING %{_bindir}/rsvg-convert %{_bindir}/rsvg-view-3 -%doc %{_mandir}/man1/rsvg-convert.1%{?ext_man} +%{_mandir}/man1/rsvg-convert.1%{?ext_man} %files -n rsvg-thumbnailer %license COPYING From 7a87b4eca564358b222fd91ff8c244296142e982798f7f9075d9e30d9d37d3b3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Mar 2018 14:25:03 +0000 Subject: [PATCH 2/3] Accepting request 583375 from GNOME:Next - Update to version 2.42.3: + glgo#GNOME/librsvg#205: The configure script now checks for Rust 1.20.0. Previously this minimum requirement was not well-defined. + glgo#GNOME/librsvg#204: New feature: If an SVG has an link element, we now generate the corresponding link when outputting to a Cairo PDF surface. If you use rsvg-convert(1) with PDF output, links in the SVG will work in the PDF. + glgo#GNOME/librsvg#108: New feature: support font-size:larger and font-size:smaller relative sizes. + New feature: rsvg-convert now supports SOURCE_DATE_EPOCH to generate reproducible output for PDFs. + glgo#GNOME/librsvg#197: New requirement: We now require Freetype2 2.9.0, which fixes font rendering bugs. The test reference PNGs have been regenerated with this version. + glgo#GNOME/librsvg#91: Fix rendering of masks and clips when the initial transformation has a translation component. + glgo#GNOME/librsvg#112: Fix: apply style attributes for all SVG elements, not just for the toplevel one. + glgo#GNOME/librsvg#161: Fix the marker angle for the last vertex of closed paths. + glgo#GNOME/librsvg#198: Fix: Make rsvg_pixbuf_from_file() and its derived functions work again. Now we have tests for the whole public API. + glgo#GNOME/librsvg#143: Minor optimizations for Gaussian blurs. + glgo#GNOME/librsvg#201: Minor speedups in the code to parse SVG attributes. + glgo#GNOME/librsvg#178: Fix some tests that failed on 32-bit machines. + In addtion to --enable-debug/--disable-debug to control the Rust compilation, now you can use an environment variable LIBRSVG_DEBUG=yes / LIBRSVG_DEBUG=no if you wish. + Code moved to Rust: SVG paint servers, SVG attribute parsing. + We now use a Cargo workspace internally, to move more things to Rust. - Add pkgconfig(freetype2) BuildRequires: New dependency. OBS-URL: https://build.opensuse.org/request/show/583375 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=122 --- librsvg-2.42.2.tar.xz | 3 --- librsvg-2.42.3.tar.xz | 3 +++ librsvg.changes | 40 ++++++++++++++++++++++++++++++++++++++++ librsvg.spec | 17 ++++++++--------- 4 files changed, 51 insertions(+), 12 deletions(-) delete mode 100644 librsvg-2.42.2.tar.xz create mode 100644 librsvg-2.42.3.tar.xz diff --git a/librsvg-2.42.2.tar.xz b/librsvg-2.42.2.tar.xz deleted file mode 100644 index aad1dd6..0000000 --- a/librsvg-2.42.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562 -size 6054020 diff --git a/librsvg-2.42.3.tar.xz b/librsvg-2.42.3.tar.xz new file mode 100644 index 0000000..2ffd52b --- /dev/null +++ b/librsvg-2.42.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:704f2c44b9b170fc5498de36a161d01ca8f584ba9c42654b98565a7b7bcbe657 +size 9486024 diff --git a/librsvg.changes b/librsvg.changes index 776e637..969a8b6 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon Mar 5 18:13:07 UTC 2018 - dimstar@opensuse.org + +- Update to version 2.42.3: + + glgo#GNOME/librsvg#205: The configure script now checks for + Rust 1.20.0. Previously this minimum requirement was not + well-defined. + + glgo#GNOME/librsvg#204: New feature: If an SVG has an link + element, we now generate the corresponding link when + outputting to a Cairo PDF surface. If you use rsvg-convert(1) + with PDF output, links in the SVG will work in the PDF. + + glgo#GNOME/librsvg#108: New feature: support font-size:larger + and font-size:smaller relative sizes. + + New feature: rsvg-convert now supports SOURCE_DATE_EPOCH to + generate reproducible output for PDFs. + + glgo#GNOME/librsvg#197: New requirement: We now require + Freetype2 2.9.0, which fixes font rendering bugs. The test + reference PNGs have been regenerated with this version. + + glgo#GNOME/librsvg#91: Fix rendering of masks and clips when + the initial transformation has a translation component. + + glgo#GNOME/librsvg#112: Fix: apply style attributes for all SVG + elements, not just for the toplevel one. + + glgo#GNOME/librsvg#161: Fix the marker angle for the last + vertex of closed paths. + + glgo#GNOME/librsvg#198: Fix: Make rsvg_pixbuf_from_file() and + its derived functions work again. Now we have tests for the + whole public API. + + glgo#GNOME/librsvg#143: Minor optimizations for Gaussian blurs. + + glgo#GNOME/librsvg#201: Minor speedups in the code to parse SVG + attributes. + + glgo#GNOME/librsvg#178: Fix some tests that failed on 32-bit + machines. + + In addtion to --enable-debug/--disable-debug to control the + Rust compilation, now you can use an environment variable + LIBRSVG_DEBUG=yes / LIBRSVG_DEBUG=no if you wish. + + Code moved to Rust: SVG paint servers, SVG attribute parsing. + + We now use a Cargo workspace internally, to move more things to + Rust. +- Add pkgconfig(freetype2) BuildRequires: New dependency. + ------------------------------------------------------------------- Wed Feb 28 16:36:14 UTC 2018 - dimstar@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index 3079fb9..98cbf39 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -17,7 +17,7 @@ Name: librsvg -Version: 2.42.2 +Version: 2.42.3 Release: 0 Summary: A Library for Rendering SVG Data License: LGPL-2.0+ AND GPL-2.0+ @@ -28,20 +28,21 @@ Source99: baselibs.conf BuildRequires: cargo BuildRequires: gobject-introspection-devel BuildRequires: pkgconfig -BuildRequires: rust +BuildRequires: rust >= 1.20 BuildRequires: rust-std BuildRequires: vala -BuildRequires: pkgconfig(cairo) >= 1.2.0 +BuildRequires: pkgconfig(cairo) >= 1.15.4 BuildRequires: pkgconfig(cairo-png) >= 1.2.0 BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) >= 20.0.14 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.20 BuildRequires: pkgconfig(gio-2.0) >= 2.24.0 BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.52.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.48.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gthread-2.0) >= 2.12.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 -BuildRequires: pkgconfig(libcroco-0.6) +BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.1 BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0 BuildRequires: pkgconfig(pangocairo) >= 1.38.0 BuildRequires: pkgconfig(pangoft2) >= 1.38.0 @@ -55,14 +56,13 @@ http://www.w3c.org). %package -n librsvg-2-2 Summary: A Library for Rendering SVG Data -# bug437293 License: LGPL-2.0-or-later Group: System/Libraries -# Provides: librsvg2 = %{version} Obsoletes: librsvg2 < %{version} Provides: librsvg = %{version} Obsoletes: librsvg < %{version} +# bug437293 %ifarch ppc64 Obsoletes: librsvg-64bit %endif @@ -92,7 +92,6 @@ Requires: librsvg-2-2 = %{version} Requires: typelib-1_0-Rsvg-2_0 = %{version} Provides: librsvg2-devel = %{version} Obsoletes: librsvg2-devel < %{version} -# %description devel This package contains all necessary include files and libraries needed @@ -179,7 +178,7 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_datadir}/thumbnailers/librsvg.thumbnailer %files devel -%doc AUTHORS ChangeLog code_of_conduct.md COMPILING.md CONTRIBUTING.md +%doc AUTHORS ChangeLog COMPILING.md CONTRIBUTING.md %{_includedir}/librsvg-2.0/ %{_libdir}/librsvg-2.so %{_libdir}/pkgconfig/librsvg-2.0.pc From b294111cb463fbfc5526bf3674e90f02d9d954e858d405c2d4a47d24661733c8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 7 Mar 2018 09:47:32 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=123 --- librsvg.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/librsvg.spec b/librsvg.spec index 98cbf39..08162b4 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -20,9 +20,9 @@ Name: librsvg Version: 2.42.3 Release: 0 Summary: A Library for Rendering SVG Data -License: LGPL-2.0+ AND GPL-2.0+ +License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -URL: https://wiki.gnome.org/Projects/LibRsvg +Url: https://wiki.gnome.org/Projects/LibRsvg Source: http://download.gnome.org/sources/librsvg/2.42/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: cargo @@ -62,10 +62,6 @@ Provides: librsvg2 = %{version} Obsoletes: librsvg2 < %{version} Provides: librsvg = %{version} Obsoletes: librsvg < %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: librsvg-64bit -%endif %description -n librsvg-2-2 This package contains a library to render SVG (scalable vector