From 9ca04ec5f87519ba06948087a4fe03386859e34c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 5 Jan 2021 18:33:40 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/inkscape.git#21232fceb48a890f0a40d985001eb64cb75e2989 --- inkscape.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inkscape.spec b/inkscape.spec index 9545caf..757992e 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -2,7 +2,7 @@ Name: inkscape Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vector-based drawing program using SVG # Inkscape tags their releases with underscores and in ALLCAPS @@ -37,7 +37,7 @@ BuildRequires: gettext BuildRequires: gsl-devel BuildRequires: gtkmm30-devel BuildRequires: gtkspell3-devel -%if ! 0%{?flatpak} +%if ! 0%{?flatpak} && ! 0%{?rhel} >= 8 BuildRequires: ImageMagick-c++-devel %endif BuildRequires: intltool @@ -61,6 +61,7 @@ BuildRequires: dbus-glib-devel BuildRequires: libjpeg-devel BuildRequires: libsigc++20-devel BuildRequires: libsoup-devel +BuildRequires: make # Disable all for now. TODO: Be smarter %if 0 @@ -225,6 +226,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inksc %changelog +* Mon Jan 04 2021 Tomas Popela - 1.0.1-3 +- Don't build with ImageMagick support in ELN/RHEL + * Fri Sep 11 2020 Kalev Lember - 1.0.1-2 - Fix appdata 1.0.1 release info