- updated list of private headers that need to be installed

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 82cb9b64db1ee5578c00c788d6148d36ddd4eaba..e9d1926a3f183c1b6d16d46f3f373c3b0ebda217 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -12,14 +12,14 @@
 %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 jasper          # JPEG2000 module (which uses jasper library)
+%bcond_without openjpeg        # JPEG2000 module (which uses openjpeg 2 library)
 %bcond_without wmf             # WMF module (which uses libwmf library)
 # - module feautres:
 %bcond_without autotrace       # Autotrace support in SVG module
 
 %include       /usr/lib/rpm/macros.perl
-%define                ver     6.8.7
-%define                pver    3
+%define                ver     6.9.0
+%define                pver    10
 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
@@ -31,17 +31,18 @@ Summary(tr.UTF-8):  X altında resim gösterme, çevirme ve değişiklik yapma
 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: b4653beb2f2b3cc33ea26490af567700
+# Source0-md5: 906193d9da1205542a17f77b9541783d
 Patch0:                %{name}-ac.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
@@ -57,7 +58,6 @@ BuildRequires:        freetype-devel >= 2.0.2-2
 %{?with_gomp: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}
@@ -73,6 +73,7 @@ BuildRequires:        libtool >= 2:2.2
 BuildRequires: libwebp-devel
 %{?with_wmf:BuildRequires:     libwmf-devel >= 2:0.2.2}
 BuildRequires: libxml2-devel >= 2.0
+%{?with_openjpeg:BuildRequires:        openjpeg2-devel >= 2.1.0}
 BuildRequires: pango-devel >= 1:1.28.1
 BuildRequires: perl-devel >= 1:5.8.1
 BuildRequires: pkgconfig
@@ -91,7 +92,9 @@ Obsoletes:    ImageMagick-coder-dps
 Obsoletes:     ImageMagick-coder-mpeg
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{!?QuantumDepth:1}%{?QuantumDepth:0}
 %define                QuantumDepth    16
+%endif
 %define                abisuf          Q%{QuantumDepth}%{?with_hdri:HDRI}
 %define                modulesdir      %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf}
 
@@ -683,9 +686,9 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
        --with-fpx%{!?with_fpx:=no} \
        --with-gslib%{!?with_gs:=no} \
        --with-gvc%{!?with_graphviz:=no} \
-       --with-jp2%{!?with_jasper:=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} \
@@ -709,7 +712,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 
 # for coders development
 install -d $RPM_BUILD_ROOT%{_includedir}/ImageMagick-6/private/magick
-cp -p magick/{blob,blob-private,exception-private,image-private,monitor-private,quantum-private,static,studio}.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick-6/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}/ImageMagick-6/private/magick
 
 cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
@@ -805,6 +808,8 @@ 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
@@ -887,6 +892,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
@@ -913,6 +920,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
@@ -929,6 +938,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
@@ -972,9 +983,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog LICENSE AUTHORS.txt
 %attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.2
 %attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.1
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.2
 %dir %{_libdir}/ImageMagick-%{ver}
 %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
 %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1026,10 +1037,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
@@ -1143,11 +1154,9 @@ rm -rf $RPM_BUILD_ROOT
 %{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
-%{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.so
 %{_mandir}/man3/Image::Magick.3pm*
 %{_mandir}/man3/Image::Magick::%{abisuf}.3pm*
@@ -1157,7 +1166,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.3
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.6
 
 %files c++-devel
 %defattr(644,root,root,755)