- updated to 6.5.8-2

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 5b18b7c6ee32576fc170e1fbaa77081d191d4e82..61883306fbefa04fbbc8042a6cca828c465fc55e 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.5.2
-%define                pver    3
+%define                ver 6.5.8
+%define                pver    2
 %define                QuantumDepth    16
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -29,8 +31,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: e40950e40574d823dbe13542f7a537c0
-#Source0:      http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
+# Source0-md5: 486322ebcf5b16f80849d0fd9ec3c7b7
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
@@ -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
@@ -636,6 +638,9 @@ 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
 
@@ -661,8 +666,6 @@ 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
@@ -671,6 +674,8 @@ rm -rf $RPM_BUILD_ROOT
 %{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
@@ -703,6 +708,8 @@ 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
@@ -838,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/boost.so
+%{modulesdir}/filters/boost.la
 
 %attr(755,root,root) %{_bindir}/animate
 %attr(755,root,root) %{_bindir}/compare
@@ -870,7 +879,7 @@ 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.*.*.*