update to version 6.9.10 patch level 34

use libwebp7

1 files changed, 11 insertions, 2 deletions

diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index dc51460..5133234 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
 # Please preserve changelog entries
 #
 %global VER        6.9.10
-%global Patchlevel 33
+%global Patchlevel 34
 %global incsuffixe -6
 %global libsuffixe -6.Q16
 %global with_tests 0%{!?_without_tests:1}
@@ -123,7 +123,8 @@ BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libraw) >= 0.14.8
 %endif
 %if %{with_webp}
-BuildRequires:  pkgconfig(libwebp)
+# Ensure we use libwebp7 on EL
+BuildRequires:  pkgconfig(libwebp) > 1
 %endif
 %if %{with_jbig}
 BuildRequires:  jbigkit-devel
@@ -203,8 +204,12 @@ Requires: libjpeg-devel%{?_isa}
 Requires: OpenEXR-devel%{?_isa}
 Requires: lcms2-devel%{?_isa}
 %if %{with_webp}
+%if 0%{?rhel}
+Requires: libwebp7-devel%{?_isa}
+%else
 Requires: libwebp-devel%{?_isa}
 %endif
+%endif
 %if %{with_jbig}
 Requires: jbigkit-devel%{?_isa}
 %endif
@@ -592,6 +597,10 @@ fi
 
 
 %changelog
+* Mon Mar 18 2019 Remi Collet <remi@remirepo.net> - 6.9.10.34-1
+- update to version 6.9.10 patch level 34
+- use libwebp7
+
 * Mon Mar 11 2019 Remi Collet <remi@remirepo.net> - 6.9.10.33-1
 - update to version 6.9.10 patch level 33