X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ImageMagick.spec;h=a2cd8632be8c4c6a021ea38d9ee0e94ea324113d;hb=d81f8ca;hp=521a6bd11aac45ed39bd0912067046f6364f732b;hpb=d48585bd6b79b28bb7db68403e83262885bc440b;p=packages%2FImageMagick.git

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 521a6bd..a2cd863 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,20 +1,30 @@
 # TODO
-# - remove magick/quantum-private.h when koffice 1.6 is fixed not to use it
+# - flif (flif.h, flif_create_decoder in libflif)
+# - raqm (raqm.pc)
+# - create sane default policy file:
+#   https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
 #
 # Conditional build:
-%bcond_without	djvu		# without DJVU module
-%bcond_without	fpx		# without FlashPIX module (which uses fpx library)
-%bcond_without	graphviz	# without Graphviz support
-%bcond_with	gs		# with PostScript support through ghostscript library (warning: breaks jpeg!)
-%bcond_without	jasper		# without JPEG2000 module (which uses jasper library)
-%bcond_without	wmf		# without WMF module (which uses libwmf library)
-%bcond_without	cxx		# without Magick++
-%bcond_without	exr		# without OpenEXR module
-#
+# - features:
+%bcond_without	cxx		# Magick++ library
+%bcond_without	opencl		# OpenCL computing support
+%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!)
+# - modules:
+%bcond_without	djvu		# DJVU module
+%bcond_without	exr		# OpenEXR module
+%bcond_without	fpx		# FlashPIX module (which uses fpx library)
+%bcond_without	graphviz	# dot module (which uses GraphViz libraries)
+%bcond_without	openjpeg	# JPEG2000 module (which uses openjpeg 2 library)
+%bcond_without	wmf		# WMF module (which uses libwmf library)
+# - module features:
+%bcond_without	autotrace	# Autotrace support in SVG module
+
+%define		origname	ImageMagick
+%define		ver	6.9.7
+%define		pver	0
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.6.0
-%define		pver	8
-%define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
 Summary(es.UTF-8):	Exhibidor, convertidor y manipulador de imágenes bajo X
@@ -24,54 +34,79 @@ Summary(pt_BR.UTF-8):	Exibidor, conversor e manipulador de imagens sob X
 Summary(ru.UTF-8):	Просмотр, конвертирование, обработка изображений под X Window
 Summary(tr.UTF-8):	X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):	Перегляд, конвертування та обробка зображень під X Window
-Name:		ImageMagick
+Name:		ImageMagick6
 Version:	%{ver}%{?pver:.%{pver}}
-Release:	1
+Release:	4
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
-Source0:	http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5:	1a676eecbddfe177859e3f48e1a18669
-Patch0:		%{name}-ac.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-libpath.patch
-Patch3:		%{name}-ldflags.patch
+Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/%{origname}-%{ver}-%{pver}.tar.xz
+# Source0-md5:	98358e387587e102e7ecc5d3c465865a
+Patch0:		config.patch
+Patch1:		%{origname}-link.patch
+Patch2:		%{origname}-libpath.patch
+Patch3:		%{origname}-ldflags.patch
+Patch4:		%{origname}-lt.patch
+Patch5:		perlmagick.patch
+Patch6:		magick6.patch
 URL:		http://www.imagemagick.org/
-BuildRequires:	OpenEXR-devel
-BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.9
+%{?with_opencl:BuildRequires:	OpenCL-devel}
+BuildRequires:	OpenEXR-devel >= 1.0.6
+BuildRequires:	autoconf >= 2.69
+BuildRequires:	automake >= 1:1.12
+%{?with_autotrace:BuildRequires:	autotrace-devel >= 0.31.1}
 BuildRequires:	bzip2-devel >= 1.0.1
-%{?with_djvu:BuildRequires:	djvulibre-devel}
+%{?with_djvu:BuildRequires:	djvulibre-devel >= 3.5.0}
 BuildRequires:	expat-devel >= 1.95.7
+BuildRequires:	fftw3-devel >= 3.0
+BuildRequires:	fontconfig-devel >= 2.1.0
 BuildRequires:	freetype-devel >= 2.0.2-2
+%{?with_openmp:BuildRequires:	gcc-c++ >= 6:4.2}
 %{?with_gs:BuildRequires:	ghostscript-devel}
-%{?with_graphviz:BuildRequires:	graphviz-devel >= 2.6}
-%{?with_jasper:BuildRequires:	jasper-devel >= 1.700.5}
+%{?with_graphviz:BuildRequires:	graphviz-devel >= 2.9.0}
 BuildRequires:	jbigkit-devel
-BuildRequires:	lcms-devel
+BuildRequires:	lcms2-devel >= 2.0
 %{?with_fpx:BuildRequires:	libfpx-devel >= 1.2.0.4-3}
-BuildRequires:	libjpeg-devel
+%{?with_openmp:BuildRequires:	libgomp-devel}
+BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	liblqr-devel >= 0.1.0
 BuildRequires:	libltdl-devel
 BuildRequires:	libpng-devel >= 1.0.8
-BuildRequires:	librsvg-devel
+BuildRequires:	librsvg-devel >= 2.9.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libwebp-devel
 %{?with_wmf:BuildRequires:	libwmf-devel >= 2:0.2.2}
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	perl-devel >= 1:5.8.0
-BuildRequires:	pkgconfig
+%{?with_openjpeg:BuildRequires:	openjpeg2-devel >= 2.1.0}
+BuildRequires:	pango-devel >= 1:1.28.1
+BuildRequires:	perl-devel >= 1:5.8.1
+BuildRequires:	pkgconfig >= 1:0.20
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.315
+BuildRequires:	tar >= 1:1.22
 # only checked for, but only supplied scripts/txt2html is used
+BuildRequires:	tar >= 1:1.22
 #BuildRequires:	txt2html
+BuildRequires:	xorg-lib-libX11
 BuildRequires:	xorg-lib-libXext
+BuildRequires:	xz
+BuildRequires:	xz-devel >= 2.9.0
+BuildRequires:	zlib-devel >= 1.0.0
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Suggests:	shared-color-profiles
 Obsoletes:	ImageMagick-coder-dps
 Obsoletes:	ImageMagick-coder-mpeg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		modulesdir	%{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
+%if 0%{!?QuantumDepth:1}
+%define		QuantumDepth	16
+%endif
+%define		abisuf		Q%{QuantumDepth}%{?with_hdri:HDRI}
+%define		modulesdir	%{_libdir}/ImageMagick-%{ver}/modules-%{abisuf}
+%define		mver		6
+%define		pname		ImageMagick-6
 
 %description
 ImageMagick is an image display, conversion, and manipulation tool. It
@@ -142,6 +177,9 @@ Summary:	ImageMagick libraries
 Summary(pl.UTF-8):	Biblioteki ImageMagick
 Summary(pt_BR.UTF-8):	Bibliotecas dinâmicas do ImageMagick
 Group:		X11/Libraries
+Requires:	fontconfig-libs >= 2.1.0
+Requires:	liblqr >= 0.1.0
+Requires:	zlib >= 1.0.0
 
 %description libs
 ImageMagick libraries.
@@ -161,14 +199,19 @@ Summary(ru.UTF-8):	Хедеры и библиотеки для программ
 Summary(uk.UTF-8):	Хедери та бібліотеки для програмування з ImageMagick
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	bzip2-devel
-Requires:	freetype-devel
-Requires:	lcms-devel
-Requires:	libjpeg-devel
+%{?with_opencl:Requires:	OpenCL-devel}
+Requires:	bzip2-devel >= 1.0.1
+Requires:	fftw3-devel >= 3.0
+Requires:	fontconfig-devel >= 2.1.0
+Requires:	freetype-devel >= 2.0.2
+Requires:	lcms2-devel >= 2.0
+%{?with_openmp:Requires:	libgomp-devel}
+Requires:	libjpeg-devel >= 6b
+Requires:	liblqr-devel >= 0.1.0
 Requires:	libltdl-devel
 Requires:	libtiff-devel
 Requires:	xorg-lib-libXext-devel
-Requires:	zlib-devel
+Requires:	zlib-devel >= 1.0.0
 
 %description devel
 This is the ImageMagick development package. It includes header files
@@ -241,7 +284,7 @@ Bibliotecas estáticas para desenvolvimento com libMagick.
 Це окремий пакет зі статичними бібліотеками, які більше не входять до
 складу ImageMagick-devel.
 
-%package perl
+%package -n perl-%{name}
 Summary:	Libraries and modules for access to ImageMagick from Perl
 Summary(pl.UTF-8):	Biblioteki i moduły Perla dla ImageMagick
 Summary(pt_BR.UTF-8):	Módulo perl para uso com o ImageMagick
@@ -251,25 +294,27 @@ Group:		Development/Languages/Perl
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	perl-dirs
+Provides:	ImageMagick-perl = %{epoch}:%{version}-%{release}
+Obsoletes:	ImageMagick-perl
 
-%description perl
+%description -n perl-%{name}
 This is the ImageMagick Perl support package. It perl modules and
 support files for access to ImageMagick library from perl without
 unuseful forking or such.
 
-%description perl -l pl.UTF-8
+%description -n perl-%{name} -l pl.UTF-8
 Biblioteki i moduły umożliwiające korzystanie z ImageMagick z poziomu
 Perla.
 
-%description perl -l pt_BR.UTF-8
+%description -n perl-%{name} -l pt_BR.UTF-8
 Este pacote fornece um módulo perl para acessar funções do ImageMagick
 em scripts Perl.
 
-%description perl -l ru.UTF-8
+%description -n perl-%{name} -l ru.UTF-8
 Это пакет ImageMagick для поддержки perl. Он включает модули perl и
 вспомогательные файлы для доступа к библиотеке ImageMagick из Perl.
 
-%description perl -l uk.UTF-8
+%description -n perl-%{name} -l uk.UTF-8
 Це пакет ImageMagick для підтримки Perl. Він містить модулі Perl та
 додаткові файли для доступу до бібліотеки ImageMagick з Perl.
 
@@ -381,16 +426,30 @@ Bibliotecas estáticas para desenvolvimento com libMagick++.
 Це окремий пакет зі статичними бібліотеками, які більше не входять до
 складу ImageMagick-c++-devel.
 
+%package coder-caption
+Summary:	Coder module to read CAPTION images
+Summary(pl.UTF-8):	Moduł kodera do odczytu obrazów CAPTION
+Group:		X11/Applications/Graphics
+URL:		http://www.imagemagick.org/Usage/text/#caption
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description coder-caption
+Coder module to Read Text Caption.
+
+%description coder-caption -l pl.UTF-8
+Moduł kodera do odczytu podpisów tekstowych (typu caption).
+
 %package coder-djvu
 Summary:	Coder module for DJVU files
 Summary(pl.UTF-8):	Moduł kodera dla plików DJVU
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	djvulibre >= 3.5.0
 
 %description coder-djvu
 Coder module for DJVU files.
 
-%description coder-djvu -l pl
+%description coder-djvu -l pl.UTF-8
 Moduł kodera dla plików DJVU.
 
 %package coder-dot
@@ -398,6 +457,7 @@ Summary:	Coder module for GraphViz DOT files
 Summary(pl.UTF-8):	Moduł kodera dla plików GraphViz DOT
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	graphviz >= 2.9.0
 
 %description coder-dot
 Coder module for GraphViz DOT files.
@@ -410,6 +470,7 @@ Summary:	Coder module for ILM EXR files
 Summary(pl.UTF-8):	Moduł kodera dla plików EXR ILM
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	OpenEXR >= 1.0.6
 
 %description coder-exr
 Coder module for ILM EXR files.
@@ -492,6 +553,20 @@ Language (MSL) files.
 Moduł kodera dla plików Magick Persistent Registry (MPR) i Magick
 Scripting Language (MSL).
 
+%package coder-pango
+Summary:	Coder module to read pango markup language format
+Summary(pl.UTF-8):	Moduł kodera do odczytu formatu języka znaczników pango
+Group:		X11/Applications/Graphics
+URL:		http://www.imagemagick.org/Usage/text/#pango
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	pango >= 1:1.28.1
+
+%description coder-pango
+Coder module to read pango markup language format.
+
+%description coder-pango -l pl.UTF-8
+Moduł kodera do odczytu formatu języka znaczników pango.
+
 %package coder-pdf
 Summary:	Coder module for PDF files
 Summary(pl.UTF-8):	Moduł kodera dla plików PDF
@@ -534,6 +609,7 @@ Summary:	Coder module for SVG (Scalable Vector Graphics) files
 Summary(pl.UTF-8):	Moduł kodera dla plików SVG (Scalable Vector Graphics)
 Group:		X11/Applications/Graphics
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	librsvg >= 2.9.0
 
 %description coder-svg
 Coder module for SVG (Scalable Vector Graphics) files.
@@ -565,6 +641,18 @@ Coder module for retrieving files via URL.
 %description coder-url -l pl.UTF-8
 Moduł kodera ściągający pliki o podanym URL.
 
+%package coder-webp
+Summary:	Coder module for WebP files
+Summary(pl.UTF-8):	Moduł kodera dla plików WebP
+Group:		X11/Applications/Graphics
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description coder-webp
+Coder module for WebP files.
+
+%description coder-webp -l pl.UTF-8
+Moduł kodera dla plików WebP.
+
 %package coder-wmf
 Summary:	Coder module for WMF files
 Summary(pl.UTF-8):	Moduł kodera dla plików WMF
@@ -578,14 +666,16 @@ Coder module for WMF files.
 Moduł kodera dla plików WMF.
 
 %prep
-%setup -q -n %{name}-%{ver}-%{pver}
+%setup -q -n %{origname}-%{ver}-%{pver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-%{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
-find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
+find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='
 
 # avoid rebuilding (broken paths in scripts/Makefile.am)
 touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
@@ -597,48 +687,70 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
 %{__autoheader}
 %{__automake}
 %configure \
+	--with-gcc-arch=no \
+	%{!?with_opencl:--disable-opencl} \
+	%{!?with_openmp:--disable-openmp} \
+	--disable-silent-rules \
 	--enable-fast-install \
-	--enable-lzw \
+	%{__enable_disable hdri} \
 	--enable-shared \
-	--disable-ltdl-install \
-	--without-dps \
-	--with%{!?with_graphviz:out}-djvu \
-	--with%{!?with_graphviz:out}-dot \
-	--with%{!?with_fpx:out}-fpx \
-	--with%{!?with_gs:out}-gslib \
-	--with%{!?with_jasper:out}-jp2 \
-	--with%{!?with_cxx:out}-magick_plus_plus \
-	--with%{!?with_wmf:out}-wmf \
-	--%{!?with_exr:dis}%{?with_exr:en}able-hdri \
-	--with-gs-font-dir=%{_fontsdir}/Type1 \
+	--enable-static \
 	--with-modules \
+	--with-autotrace%{!?with_autotrace:=no} \
+	--with-djvu%{!?with_djvu:=no} \
+	--with-dps=no \
+	--with-fpx%{!?with_fpx:=no} \
+	--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-rsvg \
 	--with-threads \
-	--with-ttf \
+	--with-webp \
 	--with-x
 
-%{__make}
-%{__perl} -pi -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
+%{__make} -j1
+%{__sed} -i -e 's,/%{origname}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgdocdir=%{_docdir}/%{name}-doc-%{version}
 
-install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
-rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
-rm -f $RPM_BUILD_ROOT%{modulesdir}/coders/dps.{la,so}
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
-
-# for koffice 1.6
-cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
+for f in Magick Wand MagickCore MagickWand Magick++; do
+  %{__mv} $RPM_BUILD_ROOT%{_bindir}/$f{,6}-config
+  %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$f{,6}-config.1
+done
+for f in ImageMagick MagickCore MagickWand Wand ImageMagick++ Magick++; do
+  %{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/$f{,6}.pc
+done
+for f in animate compare composite conjure convert display identify import mogrify montage stream ; do
+  %{__mv} $RPM_BUILD_ROOT%{_bindir}/$f{,6}
+  %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$f{,6}.1
+done
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/ImageMagick{,6}.1
+
+# for coders development
+install -d $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick
+cp -p magick/{blob,blob-private,delegate-private,exception-private,image-private,monitor-private,nt-base-private,quantum-private,static,studio}.h \
+	$RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick
+
+cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{ChangeLog,LICENSE,NEWS.txt}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -651,28 +763,27 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_libdir}/ImageMagick-%{ver}
-%dir %{_libdir}/ImageMagick-%{ver}/config
-%{_libdir}/ImageMagick-%{ver}/config/*.xml
 %dir %{modulesdir}
 %dir %{modulesdir}/coders
 %dir %{modulesdir}/filters
-%dir %{_datadir}/ImageMagick-%{ver}
-%dir %{_datadir}/ImageMagick-%{ver}/config
-%{_datadir}/ImageMagick-%{ver}/config/*.xml
-%{_datadir}/ImageMagick-%{ver}/config/sRGB.icm
+%dir %{_datadir}/%{pname}
+%{_datadir}/%{pname}/*.xml
+%dir %{_sysconfdir}/%{pname}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{pname}/*.xml
 
 # ========= coders without additional deps
+%attr(755,root,root) %{modulesdir}/coders/aai.so
+%{modulesdir}/coders/aai.la
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.la
+%attr(755,root,root) %{modulesdir}/coders/bgr.so
+%{modulesdir}/coders/bgr.la
 %attr(755,root,root) %{modulesdir}/coders/bmp.so
 %{modulesdir}/coders/bmp.la
 %attr(755,root,root) %{modulesdir}/coders/braille.so
 %{modulesdir}/coders/braille.la
-%attr(755,root,root) %{modulesdir}/coders/caption.so
-%{modulesdir}/coders/caption.la
 %attr(755,root,root) %{modulesdir}/coders/cals.so
 %{modulesdir}/coders/cals.la
 %attr(755,root,root) %{modulesdir}/coders/cin.so
@@ -689,6 +800,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/dcm.la
 %attr(755,root,root) %{modulesdir}/coders/dds.so
 %{modulesdir}/coders/dds.la
+%attr(755,root,root) %{modulesdir}/coders/debug.so
+%{modulesdir}/coders/debug.la
 %attr(755,root,root) %{modulesdir}/coders/dib.so
 %{modulesdir}/coders/dib.la
 %attr(755,root,root) %{modulesdir}/coders/dng.so
@@ -699,6 +812,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/ept.la
 %attr(755,root,root) %{modulesdir}/coders/fax.so
 %{modulesdir}/coders/fax.la
+%attr(755,root,root) %{modulesdir}/coders/fd.so
+%{modulesdir}/coders/fd.la
 %attr(755,root,root) %{modulesdir}/coders/fits.so
 %{modulesdir}/coders/fits.la
 %attr(755,root,root) %{modulesdir}/coders/gif.so
@@ -709,6 +824,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/gray.la
 %attr(755,root,root) %{modulesdir}/coders/hald.so
 %{modulesdir}/coders/hald.la
+%attr(755,root,root) %{modulesdir}/coders/hdr.so
+%{modulesdir}/coders/hdr.la
 %attr(755,root,root) %{modulesdir}/coders/histogram.so
 %{modulesdir}/coders/histogram.la
 %attr(755,root,root) %{modulesdir}/coders/hrz.so
@@ -721,14 +838,22 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/info.la
 %attr(755,root,root) %{modulesdir}/coders/inline.so
 %{modulesdir}/coders/inline.la
+%attr(755,root,root) %{modulesdir}/coders/json.so
+%{modulesdir}/coders/json.la
 %attr(755,root,root) %{modulesdir}/coders/ipl.so
 %{modulesdir}/coders/ipl.la
+%attr(755,root,root) %{modulesdir}/coders/jnx.so
+%{modulesdir}/coders/jnx.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
+%attr(755,root,root) %{modulesdir}/coders/mac.so
+%{modulesdir}/coders/mac.la
 %attr(755,root,root) %{modulesdir}/coders/magick.so
 %{modulesdir}/coders/magick.la
 %attr(755,root,root) %{modulesdir}/coders/map.so
 %{modulesdir}/coders/map.la
+%attr(755,root,root) %{modulesdir}/coders/mask.so
+%{modulesdir}/coders/mask.la
 %attr(755,root,root) %{modulesdir}/coders/mat.so
 %{modulesdir}/coders/mat.la
 %attr(755,root,root) %{modulesdir}/coders/matte.so
@@ -783,6 +908,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/raw.la
 %attr(755,root,root) %{modulesdir}/coders/rgb.so
 %{modulesdir}/coders/rgb.la
+%attr(755,root,root) %{modulesdir}/coders/rgf.so
+%{modulesdir}/coders/rgf.la
 %attr(755,root,root) %{modulesdir}/coders/rla.so
 %{modulesdir}/coders/rla.la
 %attr(755,root,root) %{modulesdir}/coders/rle.so
@@ -795,6 +922,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/sfw.la
 %attr(755,root,root) %{modulesdir}/coders/sgi.so
 %{modulesdir}/coders/sgi.la
+%attr(755,root,root) %{modulesdir}/coders/sixel.so
+%{modulesdir}/coders/sixel.la
 %attr(755,root,root) %{modulesdir}/coders/stegano.so
 %{modulesdir}/coders/stegano.la
 %attr(755,root,root) %{modulesdir}/coders/sun.so
@@ -821,6 +950,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/vid.la
 %attr(755,root,root) %{modulesdir}/coders/viff.so
 %{modulesdir}/coders/viff.la
+%attr(755,root,root) %{modulesdir}/coders/vips.so
+%{modulesdir}/coders/vips.la
 %attr(755,root,root) %{modulesdir}/coders/wbmp.so
 %{modulesdir}/coders/wbmp.la
 %attr(755,root,root) %{modulesdir}/coders/wpg.so
@@ -837,6 +968,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/xps.la
 %attr(755,root,root) %{modulesdir}/coders/x.so
 %{modulesdir}/coders/x.la
+%attr(755,root,root) %{modulesdir}/coders/xtrn.so
+%{modulesdir}/coders/xtrn.la
 %attr(755,root,root) %{modulesdir}/coders/xwd.so
 %{modulesdir}/coders/xwd.la
 %attr(755,root,root) %{modulesdir}/coders/ycbcr.so
@@ -847,42 +980,50 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/filters/analyze.so
 %{modulesdir}/filters/analyze.la
 
-%attr(755,root,root) %{_bindir}/animate
-%attr(755,root,root) %{_bindir}/compare
-%attr(755,root,root) %{_bindir}/composite
-%attr(755,root,root) %{_bindir}/conjure
-%attr(755,root,root) %{_bindir}/convert
-%attr(755,root,root) %{_bindir}/display
-%attr(755,root,root) %{_bindir}/identify
-%attr(755,root,root) %{_bindir}/import
-%attr(755,root,root) %{_bindir}/mogrify
-%attr(755,root,root) %{_bindir}/montage
-%attr(755,root,root) %{_bindir}/stream
-
-%{_mandir}/man1/ImageMagick.1*
-%{_mandir}/man1/animate.1*
-%{_mandir}/man1/compare.1*
-%{_mandir}/man1/composite.1*
-%{_mandir}/man1/convert.1*
-%{_mandir}/man1/conjure.1*
-%{_mandir}/man1/display.1*
-%{_mandir}/man1/identify.1*
-%{_mandir}/man1/import.1*
-%{_mandir}/man1/mogrify.1*
-%{_mandir}/man1/montage.1*
-%{_mandir}/man1/stream.1*
+%attr(755,root,root) %{_bindir}/animate6
+%attr(755,root,root) %{_bindir}/compare6
+%attr(755,root,root) %{_bindir}/composite6
+%attr(755,root,root) %{_bindir}/conjure6
+%attr(755,root,root) %{_bindir}/convert6
+%attr(755,root,root) %{_bindir}/display6
+%attr(755,root,root) %{_bindir}/identify6
+%attr(755,root,root) %{_bindir}/import6
+%attr(755,root,root) %{_bindir}/mogrify6
+%attr(755,root,root) %{_bindir}/montage6
+%attr(755,root,root) %{_bindir}/stream6
+
+%{_mandir}/man1/ImageMagick6.1*
+%{_mandir}/man1/animate6.1*
+%{_mandir}/man1/compare6.1*
+%{_mandir}/man1/composite6.1*
+%{_mandir}/man1/convert6.1*
+%{_mandir}/man1/conjure6.1*
+%{_mandir}/man1/display6.1*
+%{_mandir}/man1/identify6.1*
+%{_mandir}/man1/import6.1*
+%{_mandir}/man1/mogrify6.1*
+%{_mandir}/man1/montage6.1*
+%{_mandir}/man1/stream6.1*
 
 %files doc
 %defattr(644,root,root,755)
-%doc %{_defaultdocdir}/%{name}-doc-%{version}
+%doc %{_docdir}/%{name}-doc-%{version}
 
 %files libs
 %defattr(644,root,root,755)
 %doc ChangeLog LICENSE AUTHORS.txt
-%attr(755,root,root) %{_libdir}/libMagickCore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore.so.3
-%attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.3
+%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.3
+%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.3
+%dir %{_libdir}/ImageMagick-%{ver}
+%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
+%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
+
+%files coder-caption
+%defattr(644,root,root,755)
+%attr(755,root,root) %{modulesdir}/coders/caption.so
+%{modulesdir}/coders/caption.la
 
 %if %{with djvu}
 %files coder-djvu
@@ -926,10 +1067,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/jpeg.so
 %{modulesdir}/coders/jpeg.la
 
-%if %{with jasper}
+%if %{with openjpeg}
 %files coder-jpeg2
 %defattr(644,root,root,755)
-# R: jasper, libjpeg
+# R: openjpeg2, libjpeg
 %attr(755,root,root) %{modulesdir}/coders/jp2.so
 %{modulesdir}/coders/jp2.la
 %endif
@@ -948,6 +1089,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/msl.so
 %{modulesdir}/coders/msl.la
 
+%files coder-pango
+%defattr(644,root,root,755)
+# R: cairo, pango
+%attr(755,root,root) %{modulesdir}/coders/pango.so
+%{modulesdir}/coders/pango.la
+
 %files coder-pdf
 %defattr(644,root,root,755)
 # R: libtiff, libjpeg
@@ -970,7 +1117,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files coder-svg
 %defattr(644,root,root,755)
-# R: libxml2, librsvg
+# R: libxml2, librsvg, %{?with_autotrace:autotrace}
 %attr(755,root,root) %{modulesdir}/coders/svg.so
 %{modulesdir}/coders/svg.la
 
@@ -986,6 +1133,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/url.so
 %{modulesdir}/coders/url.la
 
+%files coder-webp
+%defattr(644,root,root,755)
+# R: libwebp
+%attr(755,root,root) %{modulesdir}/coders/webp.so
+%{modulesdir}/coders/webp.la
+
 %if %{with wmf}
 %files coder-wmf
 %defattr(644,root,root,755)
@@ -996,59 +1149,68 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/Magick-config
-%attr(755,root,root) %{_bindir}/MagickCore-config
-%attr(755,root,root) %{_bindir}/MagickWand-config
-%attr(755,root,root) %{_bindir}/Wand-config
-%attr(755,root,root) %{_libdir}/libMagickCore.so
-%attr(755,root,root) %{_libdir}/libMagickWand.so
-%dir %{_includedir}/ImageMagick
-%{_libdir}/libMagickCore.la
-%{_libdir}/libMagickWand.la
-%{_includedir}/ImageMagick/magick
-%{_includedir}/ImageMagick/wand
-%{_pkgconfigdir}/ImageMagick.pc
-%{_pkgconfigdir}/MagickCore.pc
-%{_pkgconfigdir}/MagickWand.pc
-%{_pkgconfigdir}/Wand.pc
-%{_mandir}/man1/Magick-config.1*
-%{_mandir}/man1/MagickCore-config.1*
-%{_mandir}/man1/MagickWand-config.1*
-%{_mandir}/man1/Wand-config.1*
+%attr(755,root,root) %{_bindir}/Magick6-config
+%attr(755,root,root) %{_bindir}/MagickCore6-config
+%attr(755,root,root) %{_bindir}/MagickWand6-config
+%attr(755,root,root) %{_bindir}/Wand6-config
+%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so
+%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so
+%dir %{_includedir}/%{pname}
+%{_includedir}/%{pname}/magick
+%{_includedir}/%{pname}/wand
+%{_includedir}/%{pname}/private
+%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/ImageMagick6.pc
+%{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/MagickCore6.pc
+%{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/MagickWand6.pc
+%{_pkgconfigdir}/Wand-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/Wand6.pc
+%{_mandir}/man1/Magick6-config.1*
+%{_mandir}/man1/MagickCore6-config.1*
+%{_mandir}/man1/MagickWand6-config.1*
+%{_mandir}/man1/Wand6-config.1*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libMagickCore.a
-%{_libdir}/libMagickWand.a
+%{_libdir}/libMagickCore-%{mver}.%{abisuf}.a
+%{_libdir}/libMagickWand-%{mver}.%{abisuf}.a
 
-%files perl
+%files -n perl-%{name}
 %defattr(644,root,root,755)
-%{perl_vendorarch}/Image/*
+%{perl_vendorarch}/Image/Magick.pm
+%dir %{perl_vendorarch}/Image/Magick
+%{perl_vendorarch}/Image/Magick/%{abisuf}.pm
 %dir %{perl_vendorarch}/auto/Image/Magick
 %{perl_vendorarch}/auto/Image/Magick/autosplit.ix
-%{perl_vendorarch}/auto/Image/Magick/Magick.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/Magick.so
-%{_mandir}/man3/Image::Magick.*
-%{_examplesdir}/%{name}-perl
+%dir %{perl_vendorarch}/auto/Image/Magick/%{abisuf}
+%{perl_vendorarch}/auto/Image/Magick/%{abisuf}/autosplit.ix
+%attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.so
+%{_mandir}/man3/Image::Magick.3pm*
+%{_mandir}/man3/Image::Magick::%{abisuf}.3pm*
+%{_examplesdir}/%{name}-perl-%{version}
 
 %if %{with cxx}
 %files c++
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libMagick++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++.so.3
+%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.7
 
 %files c++-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/Magick++-config
-%{_libdir}/libMagick++.la
-%attr(755,root,root) %{_libdir}/libMagick++.so
-%{_includedir}/ImageMagick/Magick++
-%{_includedir}/ImageMagick/Magick++.h
-%{_pkgconfigdir}/ImageMagick++.pc
-%{_pkgconfigdir}/Magick++.pc
-%{_mandir}/man1/Magick++-config.1*
+%attr(755,root,root) %{_bindir}/Magick++6-config
+%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so
+%{_includedir}/%{pname}/Magick++
+%{_includedir}/%{pname}/Magick++.h
+%{_pkgconfigdir}/ImageMagick++-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/ImageMagick++6.pc
+%{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc
+%{_pkgconfigdir}/Magick++6.pc
+%{_mandir}/man1/Magick++6-config.1*
 
 %files c++-static
 %defattr(644,root,root,755)
-%{_libdir}/libMagick++.a
+%{_libdir}/libMagick++-%{mver}.%{abisuf}.a
 %endif