summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ImageMagick6.spec35
-rw-r--r--README32
2 files changed, 44 insertions, 23 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index f4195f2..68dd521 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -8,8 +8,8 @@
#
# Please preserve changelog entries
#
-%global VER 6.9.8
-%global Patchlevel 10
+%global VER 6.9.9
+%global Patchlevel 5
%global incsuffixe -6
%global libsuffixe -6.Q16
%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
@@ -51,7 +57,7 @@
%endif
%global libname ImageMagick
-%if 0%{?fedora} > 99
+%if 0%{?fedora} > 26
Name: %{libname}
%else
Name: %{libname}6
@@ -81,6 +87,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
@@ -312,6 +321,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}
@@ -404,7 +418,7 @@ multilibFileVersions %{buildroot}%{_includedir}/%{libname}-6/magick/version.h
# 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}
@@ -445,8 +459,8 @@ fi
%files libs
%doc ChangeLog
%doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt
-%{_libdir}/libMagickCore%{?libsuffixe}.so.4*
-%{_libdir}/libMagickWand%{?libsuffixe}.so.4*
+%{_libdir}/libMagickCore%{?libsuffixe}.so.5*
+%{_libdir}/libMagickWand%{?libsuffixe}.so.5*
%{_libdir}/%{libname}-%{VER}
%if "%{name}" != "%{libname}"
%dir %{_datadir}/%{name}
@@ -501,7 +515,7 @@ fi
%files c++
%doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
%doc www/Magick++/COPYING
-%{_libdir}/libMagick++%{?libsuffixe}.so.7*
+%{_libdir}/libMagick++%{?libsuffixe}.so.8*
%files c++-devel
%doc Magick++/examples
@@ -521,6 +535,13 @@ fi
%changelog
+* Sat Aug 5 2017 Remi Collet <remi@remirepo.net> - 6.9.9.5-1
+- update to version 6.9.9 patch level 5
+- libMagickCore soname bump to 5
+- libMagickWand soname bump to 5
+- libMagick++ soname bump to 8
+- enable raw support
+
* Mon Jun 12 2017 Remi Collet <remi@remirepo.net> - 6.9.8.10-1
- update to version 6.9.8 patch level 10
diff --git a/README b/README
index c737ec1..cd9f606 100644
--- a/README
+++ b/README
@@ -4,36 +4,36 @@ ImageMagick6
Backport of the latest fedora package to get
all features in php-pecl-imagick and php-magickwand extensions.
-ImageMagick-last-libs could be installed with ImageMagick
-
-ImageMagick: (in EL5)
- libMagick.so.10
- libWand.so.10
+ImageMagick6-libs could be installed with ImageMagick
ImageMagick: (in EL6)
libMagickCore.so.2
libMagickWand.so.2
-ImageMagick: (in F16)
- libMagickCore.so.4
- libMagickWand.so.4
-
-ImageMagick: (in F17-F19, EL7)
+ImageMagick: (in EL7)
libMagickCore.so.5
libMagickWand.so.5
-ImageMagick: (in F20)
- libMagickCore-6.Q16.so.1
- libMagickWand-6.Q16.so.1
-
-ImageMagick: (in F21-25)
-ImageMagick-last-libs:
+ImageMagick: (in F21-26)
libMagickCore-6.Q16.so.2
libMagickWand-6.Q16.so.2
+ImageMagick: (in F27)
+ libMagickCore-6.Q16.so.5
+ libMagickWand-6.Q16.so.5
+
Since 6.9.6-8
libMagickCore-6.Q16.so.3
libMagickWand-6.Q16.so.3
+ libMagick++-6.Q16.so.7
+Since 6.9.7-6
+ libMagickCore-6.Q16.so.4
+ libMagickWand-6.Q16.so.4
+ libMagick++-6.Q16.so.7
+Since 6.9.9-0
+ libMagickCore-6.Q16.so.5
+ libMagickWand-6.Q16.so.5
+ libMagick++-6.Q16.so.8
On Enterprise Linux, ImageMagick6 could NOT be installed with ImageMagick.