- updated to 6.9.13-9

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 055ab709a195cc989fa71e0f83eed40f904c8ee8..57760748cbb4e3a3964e16417105c88bca5e7929 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,4 +1,5 @@
 # TODO
+# - jxl via brunsli (or wait for port to libjxl?)
 # - create sane default policy file:
 #   https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801
 #
@@ -21,8 +22,8 @@
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %define                origname        ImageMagick
-%define                ver     6.9.11
-%define                pver    34
+%define                ver     6.9.13
+%define                pver    9
 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
@@ -34,18 +35,17 @@ Summary(tr.UTF-8):  X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          ImageMagick6
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       5
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
-Source0:       https://www.imagemagick.org/download/releases/%{origname}-%{ver}-%{pver}.tar.xz
-# Source0-md5: fcc7d47c06e9047b1d9383dd624431f3
-Patch0:                config.patch
+Source0:       https://www.imagemagick.org/archive/releases/%{origname}-%{ver}-%{pver}.tar.lz
+# Source0-md5: fca6322cd818f4bf5757b4489e6fa467
 Patch1:                %{origname}-link.patch
 Patch2:                %{origname}-libpath.patch
 Patch3:                %{origname}-ldflags.patch
 Patch4:                %{origname}-lt.patch
-Patch5:                perlmagick.patch
+Patch5:                %{origname}-perl.patch
 Patch6:                magick6.patch
 Patch7:                %{origname}-OpenCL.patch
 URL:           https://legacy.imagemagick.org/
@@ -53,7 +53,7 @@ URL:          https://legacy.imagemagick.org/
 BuildRequires: OpenEXR-devel >= 1.0.6
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.12
-%{?with_autotrace:BuildRequires:       autotrace-devel >= 0.31.1}
+%{?with_autotrace:BuildRequires:       autotrace-devel >= 0.31.2}
 BuildRequires: bzip2-devel >= 1.0.1
 %{?with_djvu:BuildRequires:    djvulibre-devel >= 3.5.0}
 BuildRequires: expat-devel >= 1.95.7
@@ -79,9 +79,10 @@ BuildRequires:       librsvg-devel >= 2.9.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 2:2.2
-BuildRequires: libwebp-devel >= 0.4.4
+BuildRequires: libwebp-devel >= 0.5.0
 %{?with_wmf:BuildRequires:     libwmf-devel >= 2:0.2.2}
 BuildRequires: libxml2-devel >= 2.0
+BuildRequires: lzip
 %{?with_openjpeg:BuildRequires:        openjpeg2-devel >= 2.1.0}
 BuildRequires: pango-devel >= 1:1.28.1
 BuildRequires: perl-devel >= 1:5.8.1
@@ -93,14 +94,17 @@ BuildRequires:      tar >= 1:1.22
 #BuildRequires:        txt2html
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xz
 BuildRequires: xz-devel >= 2.9.0
 BuildRequires: zstd-devel >= 1.0.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
+Obsoletes:     ImageMagick-coder-braille < 1:6.4.1.3-2
+Obsoletes:     ImageMagick-coder-dds < 1:6.4.1.3-2
+Obsoletes:     ImageMagick-coder-dps < 1:6.2.6.0-3
+Obsoletes:     ImageMagick-coder-hdf < 1:5.5.2.5
+Obsoletes:     ImageMagick-coder-xps < 1:6.4.1.3-2
+Obsoletes:     ImageMagick-coder-mpeg < 1:5.5.2.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if 0%{!?QuantumDepth:1}
@@ -298,7 +302,7 @@ Requires:   %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      perl-dirs
 Provides:      ImageMagick-perl = %{epoch}:%{version}-%{release}
-Obsoletes:     ImageMagick-perl
+Obsoletes:     ImageMagick-perl < 1:6.6.1.1-4
 
 %description -n perl-%{name}
 This is the ImageMagick Perl support package. It perl modules and
@@ -649,6 +653,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}
+%{?with_autotrace:Requires:    autotrace >= 0.31.2}
 Requires:      librsvg >= 2.9.0
 
 %description coder-svg
@@ -687,7 +692,7 @@ 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}
-Requires:      libwebp >= 0.4.4
+Requires:      libwebp >= 0.5.0
 
 %description coder-webp
 Coder module for WebP files.
@@ -709,7 +714,6 @@ Moduł kodera dla plików WMF.
 
 %prep
 %setup -q -n %{origname}-%{ver}-%{pver}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -742,6 +746,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        --with-autotrace%{!?with_autotrace:=no} \
        --with-djvu%{!?with_djvu:=no} \
        --with-dps=no \
+       --with-fftw \
        --with-fpx%{!?with_fpx:=no} \
        --with-gs-font-dir=%{_fontsdir}/Type1 \
        --with-gslib%{!?with_gs:=no} \
@@ -792,7 +797,7 @@ 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}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{LICENSE,NEWS.txt}
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -1010,8 +1015,6 @@ 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
@@ -1053,11 +1056,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE AUTHORS.txt
+%doc LICENSE AUTHORS.txt
 %attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.7
 %attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.7
 %dir %{_libdir}/ImageMagick-%{ver}
 %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
 %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1243,8 +1246,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_vendorarch}/Image/Magick
 %{perl_vendorarch}/Image/Magick/%{abisuf}.pm
 %dir %{perl_vendorarch}/auto/Image/Magick
-%{perl_vendorarch}/auto/Image/Magick/autosplit.ix
-%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
@@ -1256,7 +1257,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.8
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.9
 
 %files c++-devel
 %defattr(644,root,root,755)