# TODO
-# - remove magick/quantum-private.h when koffice 1.6 is fixed not to use it
+# - 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 gomp # without OpenMP support
-%bcond_without graphviz # without dot module (which uses GraphViz libraries)
-%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!)
+%bcond_without raqm # RAQM support in annotate
+# - 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 ver 7.0.5
+%define pver 10
%include /usr/lib/rpm/macros.perl
-%define ver 6.7.5
-%define pver 9
-%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
Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window
Name: ImageMagick
Version: %{ver}%{?pver:.%{pver}}
-Release: 1
+Release: 4
Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: d1bf4638d244569f4b2c9c458fb568a8
-Patch0: %{name}-ac.patch
+# Source0-md5: d5e87f7297a9ffc7b146bab4bbe8cc35
+Patch0: config.patch
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
Patch4: %{name}-lt.patch
URL: http://www.imagemagick.org/
+%{?with_opencl:BuildRequires: OpenCL-devel}
BuildRequires: OpenEXR-devel >= 1.0.6
-BuildRequires: autoconf >= 2.67
-BuildRequires: automake >= 1:1.11
+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: flif-devel
BuildRequires: fontconfig-devel >= 2.1.0
BuildRequires: freetype-devel >= 2.0.2-2
-%{?with_gomp:BuildRequires: gcc-c++ >= 6:4.2}
+%{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2}
%{?with_gs:BuildRequires: ghostscript-devel}
%{?with_graphviz:BuildRequires: graphviz-devel >= 2.9.0}
-%{?with_jasper:BuildRequires: jasper-devel >= 1.700.5}
BuildRequires: jbigkit-devel
BuildRequires: lcms2-devel >= 2.0
%{?with_fpx:BuildRequires: libfpx-devel >= 1.2.0.4-3}
-%{?with_gomp:BuildRequires: libgomp-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
+%{?with_raqm:BuildRequires: libraqm-devel}
BuildRequires: librsvg-devel >= 2.9.0
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel
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
+# just checked for, actually supplied scripts/txt2html is used
#BuildRequires: txt2html
-BuildRequires: xorg-lib-libXext
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
BuildRequires: xz
-BuildRequires: xz-devel
-BuildRequires: zlib-devel
+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 %{!?QuantumDepth:1}%{?QuantumDepth:0}
+%define QuantumDepth 16
+%endif
+%define abisuf Q%{QuantumDepth}%{?with_hdri:HDRI}
+%define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf}
+%define mver 7
+%define pname ImageMagick-7
%description
ImageMagick is an image display, conversion, and manipulation tool. It
Group: X11/Libraries
Requires: fontconfig-libs >= 2.1.0
Requires: liblqr >= 0.1.0
+Requires: zlib >= 1.0.0
%description libs
ImageMagick libraries.
Summary(uk.UTF-8): Хедери та бібліотеки для програмування з ImageMagick
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%{?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_gomp:Requires: libgomp-devel}
+%{?with_openmp:Requires: libgomp-devel}
Requires: libjpeg-devel >= 6b
Requires: liblqr-devel >= 0.1.0
Requires: libltdl-devel
Це окремий пакет зі статичними бібліотеками, які більше не входять до
складу 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-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)
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}
+
+%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
%{__autoheader}
%{__automake}
%configure \
- --disable-ltdl-install \
- %{!?with_gomp:--disable-openmp} \
+ --with-gcc-arch=no \
+ %{!?with_opencl:--disable-opencl} \
+ %{!?with_openmp:--disable-openmp} \
--disable-silent-rules \
--enable-fast-install \
+ %{__enable_disable hdri} \
--enable-shared \
--enable-static \
- --without-dps \
- --with%{!?with_djvu:out}-djvu \
- --with%{!?with_fpx:out}-fpx \
- --with%{!?with_graphviz:out}-gvc \
- --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 \
--with-modules \
+ --with-autotrace%{!?with_autotrace:=no} \
+ --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-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} -j 1
-%{__perl} -pi -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
+%{__make} -j1
+%{__sed} -i -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__make} -j 1 install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
pkgdocdir=%{_docdir}/%{name}-doc-%{version}
-install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/doc/ImageMagick/{ChangeLog,LICENSE,NEWS.txt}
+# for coders development
+install -d $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/MagickCore
+cp -p MagickCore/{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/MagickCore
+
+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
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
-# for koffice 1.6
-cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{mver}/{ChangeLog,LICENSE,NEWS.txt}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
rm -rf $RPM_BUILD_ROOT
%dir %{modulesdir}
%dir %{modulesdir}/coders
%dir %{modulesdir}/filters
-%dir %{_datadir}/ImageMagick-%{ver}
-%{_datadir}/ImageMagick-%{ver}/*.xml
-%dir %{_sysconfdir}/ImageMagick
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick/*.xml
-%{_sysconfdir}/ImageMagick/sRGB.icc
+%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/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
%{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
%{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/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
%{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
%{modulesdir}/coders/plasma.la
%attr(755,root,root) %{modulesdir}/coders/pnm.so
%{modulesdir}/coders/pnm.la
-%attr(755,root,root) %{modulesdir}/coders/preview.so
-%{modulesdir}/coders/preview.la
%attr(755,root,root) %{modulesdir}/coders/psd.so
%{modulesdir}/coders/psd.la
%attr(755,root,root) %{modulesdir}/coders/ps.so
%{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
%{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
%{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
%{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
%attr(755,root,root) %{_bindir}/display
%attr(755,root,root) %{_bindir}/identify
%attr(755,root,root) %{_bindir}/import
+%attr(755,root,root) %{_bindir}/magick
+%attr(755,root,root) %{_bindir}/magick-script
%attr(755,root,root) %{_bindir}/mogrify
%attr(755,root,root) %{_bindir}/montage
%attr(755,root,root) %{_bindir}/stream
%{_mandir}/man1/display.1*
%{_mandir}/man1/identify.1*
%{_mandir}/man1/import.1*
+%{_mandir}/man1/magick.1*
+%{_mandir}/man1/magick-script.1*
%{_mandir}/man1/mogrify.1*
%{_mandir}/man1/montage.1*
%{_mandir}/man1/stream.1*
%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.5
-%attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.5
+%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.2
+%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.0
%dir %{_libdir}/ImageMagick-%{ver}
-%dir %{_libdir}/ImageMagick-%{ver}/config
-%{_libdir}/ImageMagick-%{ver}/config/configure.xml
+%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
%{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)
%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
%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
%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
%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
-%{_includedir}/ImageMagick/magick
-%{_includedir}/ImageMagick/wand
+%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so
+%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so
+%dir %{_includedir}/%{pname}
+%{_includedir}/%{pname}/MagickCore
+%{_includedir}/%{pname}/MagickWand
+%{_includedir}/%{pname}/private
+%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/ImageMagick.pc
+%{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/MagickCore.pc
+%{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.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*
%files static
%defattr(644,root,root,755)
-%{_libdir}/libMagickCore.a
-%{_libdir}/libMagickWand.a
+%{_libdir}/libMagickCore-%{mver}.%{abisuf}.a
+%{_libdir}/libMagickWand-%{mver}.%{abisuf}.a
%files -n perl-%{name}
%defattr(644,root,root,755)
%{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
+%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.5
+%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.2
%files c++-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Magick++-config
-%attr(755,root,root) %{_libdir}/libMagick++.so
-%{_includedir}/ImageMagick/Magick++
-%{_includedir}/ImageMagick/Magick++.h
-%{_pkgconfigdir}/ImageMagick++.pc
+%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so
+%{_includedir}/%{pname}/Magick++
+%{_includedir}/%{pname}/Magick++.h
+%{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/Magick++.pc
%{_mandir}/man1/Magick++-config.1*
%files c++-static
%defattr(644,root,root,755)
-%{_libdir}/libMagick++.a
+%{_libdir}/libMagick++-%{mver}.%{abisuf}.a
%endif