- updated to 7.0.5-9

- package modules: pgx (in base), flif (in subpackage)
- handle raqm support in annotate utility

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 83ca7f9eddb8b70ddd6558cf3a1355a22341ce90..46ef53437e420eefd35e65345a547c324c192c34 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,9 +1,6 @@
 # TODO
 # - create sane default policy file:
 #   https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
-# - unpackaged:
-#   /usr/lib64/ImageMagick-7.0.5/modules-Q16/coders/pgx.la
-#   /usr/lib64/ImageMagick-7.0.5/modules-Q16/coders/pgx.so
 #
 # Conditional build:
 # - features:
@@ -12,6 +9,7 @@
 %bcond_without openmp          # OpenMP computing support
 %bcond_with    hdri            # HDRI support (accurately represent the wide range of intensity levels found in real scenes)
 %bcond_with    gs              # PostScript support through ghostscript library (warning: breaks jpeg (and possibly tiff) because of symbol clashes!)
+%bcond_without raqm            # RAQM support in annotate
 # - modules:
 %bcond_without djvu            # DJVU module
 %bcond_without exr             # OpenEXR module
@@ -23,7 +21,7 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                ver     7.0.5
-%define                pver    5
+%define                pver    9
 %include       /usr/lib/rpm/macros.perl
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -41,7 +39,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 617fbbc095c4ab514bbb066566e9108b
+# Source0-md5: f8f02b611c6f0143e2fd17d5f656ede4
 Patch0:                config.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
@@ -57,6 +55,7 @@ BuildRequires:        bzip2-devel >= 1.0.1
 %{?with_djvu:BuildRequires:    djvulibre-devel}
 BuildRequires: expat-devel >= 1.95.7
 BuildRequires: fftw3-devel >= 3.0
+BuildRequires: flif-devel
 BuildRequires: fontconfig-devel >= 2.1.0
 BuildRequires: freetype-devel >= 2.0.2-2
 %{?with_openmp:BuildRequires:  gcc-c++ >= 6:4.2}
@@ -70,6 +69,7 @@ BuildRequires:        libjpeg-devel >= 6b
 BuildRequires: liblqr-devel >= 0.1.0
 BuildRequires: libltdl-devel
 BuildRequires: libpng-devel >= 1.0.8
+%{?with_raqm:BuildRequires:    libraqm-devel}
 BuildRequires: librsvg-devel >= 2.9.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
@@ -473,6 +473,18 @@ Coder module for ILM EXR files.
 %description coder-exr -l pl.UTF-8
 Moduł kodera dla plików EXR ILM.
 
+%package coder-flif
+Summary:       Coder module for FLIF (Free Lossless Image Format) files
+Summary(pl.UTF-8):     Moduł kodera dla plików FLIF (Free Lossless Image Format)
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description coder-flif
+Coder module for FLIF (Free Lossless Image Format) files.
+
+%description coder-flif -l pl.UTF-8
+Moduł kodera dla plików FLIF (Free Lossless Image Format).
+
 %package coder-fpx
 Summary:       Coder module for FlashPIX (FPX) files
 Summary(pl.UTF-8):     Moduł kodera dla plików FlashPIX (FPX)
@@ -692,19 +704,20 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        --with-djvu%{!?with_djvu:=no} \
        --with-dps=no \
        --with-fpx%{!?with_fpx:=no} \
+       --with-gs-font-dir=%{_fontsdir}/Type1 \
        --with-gslib%{!?with_gs:=no} \
        --with-gvc%{!?with_graphviz:=no} \
        --with-magick_plus_plus%{!?with_cxx:=no} \
        --with-openexr%{!?with_exr:=no} \
        --with-openjp2%{!?with_openjpeg:=no} \
-       --with-wmf%{!?with_wmf:=no} \
-       --with-gs-font-dir=%{_fontsdir}/Type1 \
        --with-perl=%{__perl} \
        --with-perl-options="INSTALLDIRS=vendor" \
        --with-quantum-depth=%{QuantumDepth} \
+       --with-raqm%{!?with_raqm:=no} \
        --with-rsvg \
        --with-threads \
        --with-webp \
+       --with-wmf%{!?with_wmf:=no} \
        --with-x
 
 %{__make} -j1
@@ -867,6 +880,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/pes.la
 %attr(755,root,root) %{modulesdir}/coders/pdb.so
 %{modulesdir}/coders/pdb.la
+%attr(755,root,root) %{modulesdir}/coders/pgx.so
+%{modulesdir}/coders/pgx.la
 %attr(755,root,root) %{modulesdir}/coders/pict.so
 %{modulesdir}/coders/pict.la
 %attr(755,root,root) %{modulesdir}/coders/pix.so
@@ -1028,6 +1043,12 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/exr.la
 %endif
 
+%files coder-flif
+%defattr(644,root,root,755)
+# R: flif
+%attr(755,root,root) %{modulesdir}/coders/flif.so
+%{modulesdir}/coders/flif.la
+
 %if %{with fpx}
 %files coder-fpx
 %defattr(644,root,root,755)