From 4219f152ea8fb2e8e7b467eb22560f84f093d9bb Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 30 Oct 2020 02:30:53 +0100 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/autotrace.git#21ef0bb07fbec78e204fc7fc9764b51663e752af --- autotrace.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/autotrace.spec b/autotrace.spec index 6af7920..bf18b01 100644 --- a/autotrace.spec +++ b/autotrace.spec @@ -1,6 +1,6 @@ Name: autotrace Version: 0.31.1 -Release: 57%{?dist} +Release: 58%{?dist} Summary: Utility for converting bitmaps to vector graphics License: GPLv2+ and LGPLv2+ URL: http://autotrace.sourceforge.net/ @@ -14,7 +14,9 @@ Patch5: autotrace-0.31.1-multilib-fix.patch Patch6: autotrace-0.31.1-pstoedit-detection-fix.patch Patch7: autotrace-0.31.1-CVE-2016-7392.patch BuildRequires: gcc-c++ +%if ! 0%{?rhel} BuildRequires: ImageMagick-devel +%endif BuildRequires: libpng-devel > 2:1.2 BuildRequires: libexif-devel BuildRequires: libtiff-devel @@ -41,7 +43,9 @@ Postscript, SVG, xfig, SWF, and others. Summary: Header files for autotrace Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +%if ! 0%{?rhel} Requires: ImageMagick-devel +%endif Requires: pstoedit-devel @@ -61,7 +65,11 @@ This package contains header files and development libraries for autotrace. autoreconf -ivf %build +%if ! 0%{?rhel} %configure +%else +%configure --without-magick +%endif # remove rpaths sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -95,6 +103,9 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' %changelog +* Wed Oct 28 2020 Parag Nemade - 0.31.1-58 +- Don't build with ImageMagick on EL + * Mon Jul 27 2020 Fedora Release Engineering - 0.31.1-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild