- ImageMagick-7.0.5-5 rebuild

[packages/fail.git] / fail.spec

diff --git a/fail.spec b/fail.spec
index 0117b2290a7efca6659033e05f8f45634b8b26bd..d27b391c499f396c4c2aa78880bc99aaa5dfad41 100644 (file)
--- a/fail.spec
+++ b/fail.spec
@@ -6,17 +6,23 @@
 %bcond_without html5   # HTML5 viewer
 %bcond_without magick  # ImageMagick coder
 #
+# html5 requires cito that requires mono that is not available yet on x32
+%ifarch x32
+%undefine      with_html5
+%endif
+
 Summary:       FAIL - First Atari Image Library
 Summary(pl.UTF-8):     FAIL (First Atari Image Library) - biblioteka do obrazów w formatach Atari
 Name:          fail
-Version:       2.0.0
-Release:       1
+Version:       2.0.1
+Release:       12
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://downloads.sourceforge.net/fail/%{name}-%{version}.tar.gz
-# Source0-md5: de3592b78144ef3c6b2e98377522df69
+# Source0-md5: b9362106f9a23a1f99ff7bece94d9aa7
+Patch0:                imagemagick7.patch
 URL:           http://fail.sourceforge.net/
-%{?with_magick:BuildRequires:  ImageMagick-devel >= 6.8}
+%{?with_magick:BuildRequires:  ImageMagick-devel >= 1:6.8}
 %{?with_html5:BuildRequires:   asciidoc}
 %{?with_html5:BuildRequires:   cito}
 BuildRequires: libpng-devel
@@ -25,7 +31,6 @@ BuildRequires:        zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with magick}
-%define                magick_ver      %(MagickCore-config --version || echo ERROR)
 %define                im_coders_dir   %{_libdir}/%(MagickCore-config --version | sed -e 's,^\\([.0-9]\\+\\) \\+\\(Q[0-9]\\+\\)\\( \\+\\(HDRI\\)\\)\\?.*,ImageMagick-\\1/modules-\\2\\4,')/coders
 %endif
 
@@ -65,9 +70,7 @@ Przeglądarka FAIL do plików z Atari w HTML5.
 Summary:       FAIL coder for ImageMagick
 Summary(pl.UTF-8):     Koder FAIL dla ImageMagicka
 Group:         Libraries
-%if %{with magick}
-Requires:      ImageMagick >= %{magick_ver}
-%endif
+%requires_ge_to        ImageMagick ImageMagick-devel
 
 %description -n ImageMagick-coder-fail
 FAIL coder for ImageMagick to read Atari formats.
@@ -77,13 +80,14 @@ Koder FAIL dla ImageMagicka, czytający formaty Atari.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} all fail-mime.xml \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} -Wall" \
 %if %{with magick}
-       MAGICK_INCLUDE_PATH=/usr/include/ImageMagick-6/private \
+       MAGICK_INCLUDE_PATH=/usr/include/ImageMagick-7/private \
        CAN_INSTALL_MAGICK=1
 %endif