[packages/fail] - handle ImageMagick epoch

qboosh qboosh at pld-linux.org
Sat Apr 13 12:40:44 CEST 2013


commit dce5707da86b3034b705fdb74ec0d45bf2719766
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 13 12:40:59 2013 +0200

    - handle ImageMagick epoch

 fail.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/fail.spec b/fail.spec
index 0117b22..7236a9d 100644
--- a/fail.spec
+++ b/fail.spec
@@ -16,7 +16,7 @@ Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/fail/%{name}-%{version}.tar.gz
 # Source0-md5:	de3592b78144ef3c6b2e98377522df69
 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 +25,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 +64,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.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fail.git/commitdiff/dce5707da86b3034b705fdb74ec0d45bf2719766



More information about the pld-cvs-commit mailing list