- updated to 6.5.8-10

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index c36fbe89453af0aeb8d1d457d7ee1d59c6d90463..cefc41229dadb18c693c88f0861fc81e0e61939a 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,3 +1,5 @@
+# TODO
+# - remove magick/quantum-private.h when koffice 1.6 is fixed not to use it
 #
 # Conditional build:
 %bcond_without djvu            # without DJVU module
@@ -10,8 +12,8 @@
 %bcond_without exr             # without OpenEXR module
 #
 %include       /usr/lib/rpm/macros.perl
-%define                ver 6.4.1
-%define                pver    3
+%define                ver 6.5.8
+%define                pver    10
 %define                QuantumDepth    16
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -29,15 +31,14 @@ Epoch:              1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: 3d1976afe522c572aa5e97cff3029649
-#Source0:      http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
+# Source0-md5: fc04d56c32bb2eebba7885d0db042f9a
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
 Patch3:                %{name}-ldflags.patch
 URL:           http://www.imagemagick.org/
 BuildRequires: OpenEXR-devel
-BuildRequires: autoconf >= 2.59-9
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.9
 BuildRequires: bzip2-devel >= 1.0.1
 %{?with_djvu:BuildRequires:    djvulibre-devel}
@@ -60,6 +61,7 @@ BuildRequires:        libtool >= 2:1.5
 %{?with_wmf:BuildRequires:     libwmf-devel >= 2:0.2.2}
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: perl-devel >= 1:5.8.0
+BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.315
 # only checked for, but only supplied scripts/txt2html is used
@@ -577,7 +579,7 @@ Coder module for WMF files.
 Moduł kodera dla plików WMF.
 
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q -n %{name}-%{ver}-%{pver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -631,6 +633,13 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -657,14 +666,16 @@ rm -rf $RPM_BUILD_ROOT
 # ========= coders without additional deps
 %attr(755,root,root) %{modulesdir}/coders/art.so
 %{modulesdir}/coders/art.la
-%attr(755,root,root) %{modulesdir}/coders/avi.so
-%{modulesdir}/coders/avi.la
 %attr(755,root,root) %{modulesdir}/coders/avs.so
 %{modulesdir}/coders/avs.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
 %{modulesdir}/coders/cin.la
 %attr(755,root,root) %{modulesdir}/coders/cip.so
@@ -677,6 +688,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/cut.la
 %attr(755,root,root) %{modulesdir}/coders/dcm.so
 %{modulesdir}/coders/dcm.la
+%attr(755,root,root) %{modulesdir}/coders/dds.so
+%{modulesdir}/coders/dds.la
 %attr(755,root,root) %{modulesdir}/coders/dib.so
 %{modulesdir}/coders/dib.la
 %attr(755,root,root) %{modulesdir}/coders/dng.so
@@ -695,14 +708,20 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/gradient.la
 %attr(755,root,root) %{modulesdir}/coders/gray.so
 %{modulesdir}/coders/gray.la
+%attr(755,root,root) %{modulesdir}/coders/hald.so
+%{modulesdir}/coders/hald.la
 %attr(755,root,root) %{modulesdir}/coders/histogram.so
 %{modulesdir}/coders/histogram.la
+%attr(755,root,root) %{modulesdir}/coders/hrz.so
+%{modulesdir}/coders/hrz.la
 %attr(755,root,root) %{modulesdir}/coders/html.so
 %{modulesdir}/coders/html.la
 %attr(755,root,root) %{modulesdir}/coders/icon.so
 %{modulesdir}/coders/icon.la
 %attr(755,root,root) %{modulesdir}/coders/info.so
 %{modulesdir}/coders/info.la
+%attr(755,root,root) %{modulesdir}/coders/inline.so
+%{modulesdir}/coders/inline.la
 %attr(755,root,root) %{modulesdir}/coders/ipl.so
 %{modulesdir}/coders/ipl.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
@@ -813,6 +832,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/xc.la
 %attr(755,root,root) %{modulesdir}/coders/xpm.so
 %{modulesdir}/coders/xpm.la
+%attr(755,root,root) %{modulesdir}/coders/xps.so
+%{modulesdir}/coders/xps.la
 %attr(755,root,root) %{modulesdir}/coders/x.so
 %{modulesdir}/coders/x.la
 %attr(755,root,root) %{modulesdir}/coders/xwd.so
@@ -824,6 +845,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{modulesdir}/filters/analyze.so
 %{modulesdir}/filters/analyze.la
+%attr(755,root,root) %{modulesdir}/filters/convolve.la
+%{modulesdir}/filters/convolve.so
 
 %attr(755,root,root) %{_bindir}/animate
 %attr(755,root,root) %{_bindir}/compare
@@ -856,9 +879,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE
+%doc ChangeLog LICENSE AUTHORS.txt
 %attr(755,root,root) %{_libdir}/libMagickCore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore.so.2
 %attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.2
 
 %if %{with djvu}
 %files coder-djvu
@@ -978,6 +1003,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -985,6 +1011,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
@@ -1009,6 +1036,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libMagick++.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagick++.so.2
 
 %files c++-devel
 %defattr(644,root,root,755)