From f9b954c321e97b0db4f8b25b3672ddbad968bb14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 5 Aug 2017 07:49:24 +0200 Subject: v7.0.6-5 --- ImageMagick7.spec | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/ImageMagick7.spec b/ImageMagick7.spec index 8bdaf60..2c3860d 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 7.0.6 -%global Patchlevel 0 +%global Patchlevel 5 %global incsuffixe -7 %global libsuffixe -7.Q16HDRI %global with_tests 0%{!?_without_tests:1} @@ -30,6 +30,12 @@ %global with_gslib 0 %endif +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%global with_raw 1 +%else +%global with_raw 0 +%endif + %if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 %global with_raqm 1 %else @@ -84,6 +90,9 @@ BuildRequires: libxml2-devel, librsvg2-devel BuildRequires: fftw-devel BuildRequires: OpenEXR-devel BuildRequires: lcms2-devel +%if %{with_raw} +BuildRequires: LibRaw-devel >= 0.14.8 +%endif %if %{with_webp} BuildRequires: libwebp-devel %endif @@ -311,6 +320,11 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples --with-wmf \ --with-lcms \ --with-openexr \ +%if %{with_raw} + --with-raw \ +%else + --without-raw \ +%endif --with-rsvg \ --with-xml \ %if %{with_webp} @@ -403,7 +417,7 @@ multilibFileVersions %{buildroot}%{_includedir}/%{libname}%{incsuffixe}/MagickCo # Fonts must be packaged separately. It does not have matter and demos work without it. -rm PerlMagick/demo/Generic.ttf +rm -f PerlMagick/demo/Generic.ttf %if %{with_tests} @@ -430,8 +444,8 @@ make %{?_smp_mflags} check %files libs %doc ChangeLog %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt -%{_libdir}/libMagickCore%{?libsuffixe}.so.2* -%{_libdir}/libMagickWand%{?libsuffixe}.so.0* +%{_libdir}/libMagickCore%{?libsuffixe}.so.3* +%{_libdir}/libMagickWand%{?libsuffixe}.so.3* %{_libdir}/%{libname}-%{VER} %if %{move} %dir %{_datadir}/%{name} @@ -480,7 +494,7 @@ make %{?_smp_mflags} check %files c++ %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README %doc www/Magick++/COPYING -%{_libdir}/libMagick++%{?libsuffixe}.so.2* +%{_libdir}/libMagick++%{?libsuffixe}.so.3* %files c++-devel %doc Magick++/examples @@ -498,6 +512,13 @@ make %{?_smp_mflags} check %changelog +* Sat Aug 5 2017 Remi Collet - 7.0.6.5-1 +- update to version 7.0.6 patch level 5 +- libMagickCore soname bump to 3 +- libMagickWand soname bump to 3 +- libMagick++ soname bump to 3 +- enable raw support + * Mon Jun 12 2017 Remi Collet - 7.0.6.0-1 - update to version 7.0.6 -- cgit