Fixed ImageMagick conditional and some spec cleanup
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
parent
ddac0e5a7c
commit
78806e53f8
@ -4,12 +4,13 @@ Release: %autorelease
|
|||||||
Summary: Utility for converting bitmaps to vector graphics
|
Summary: Utility for converting bitmaps to vector graphics
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: http://autotrace.sourceforge.net/
|
URL: http://autotrace.sourceforge.net/
|
||||||
Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
# https://github.com/autotrace/autotrace/pull/105
|
# https://github.com/autotrace/autotrace/pull/105
|
||||||
Patch0: autotrace-0.31.9-pr105-ImageMagick7.patch
|
Patch0: autotrace-0.31.9-pr105-ImageMagick7.patch
|
||||||
|
# https://github.com/autotrace/autotrace/pull/108
|
||||||
Patch1: autotrace-0.31.9-expected-test-failure-no-imagemagick.patch
|
Patch1: autotrace-0.31.9-expected-test-failure-no-imagemagick.patch
|
||||||
# No ImageMagick in RHEL 8 and future releases
|
# No ImageMagick in RHEL 8 and future releases
|
||||||
%if !(0%{?rhel} >= 8)
|
%if 0%{?rhel} < 8
|
||||||
BuildRequires: ImageMagick-devel
|
BuildRequires: ImageMagick-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -40,7 +41,7 @@ Postscript, SVG, xfig, SWF, and others.
|
|||||||
Summary: Header files for autotrace
|
Summary: Header files for autotrace
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
%if !(0%{?rhel} >= 8)
|
%if 0%{?rhel} < 8
|
||||||
Requires: ImageMagick-devel
|
Requires: ImageMagick-devel
|
||||||
%endif
|
%endif
|
||||||
Requires: pstoedit-devel
|
Requires: pstoedit-devel
|
||||||
@ -56,12 +57,12 @@ This package contains header files and development libraries for autotrace.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
%if ! ( 0%{?rhel} >= 8 )
|
%if 0%{?rhel} < 8
|
||||||
%configure --without-magick --disable-static
|
|
||||||
%else
|
|
||||||
%configure --enable-magick-readers --disable-static
|
%configure --enable-magick-readers --disable-static
|
||||||
|
%else
|
||||||
|
%configure --without-magick --disable-static
|
||||||
%endif
|
%endif
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
Reference in New Issue
Block a user