- updated to 6.6.0-1

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 374af47b99e0c0225ecfade360580d52d3dbb604..bd6ac9e8b91219717706a1b516fe2bab1610d5f9 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.3
-%define                pver    3
+%define                ver 6.6.0
+%define                pver    1
 %define                QuantumDepth    16
 Summary:       Image display, conversion, and manipulation under X
 Summary(de.UTF-8):     Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -29,7 +31,7 @@ Epoch:                1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: c6ce6978570d54abae8fa8cc7d65932c
+# Source0-md5: fefe007538e00bef2b75c5ee3b028ecf
 Patch0:                %{name}-ac.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
@@ -42,7 +44,6 @@ BuildRequires:        bzip2-devel >= 1.0.1
 %{?with_djvu:BuildRequires:    djvulibre-devel}
 BuildRequires: expat-devel >= 1.95.7
 BuildRequires: freetype-devel >= 2.0.2-2
-BuildRequires: gd-devel >= 2.0.15
 %{?with_gs:BuildRequires:      ghostscript-devel}
 %{?with_graphviz:BuildRequires:        graphviz-devel >= 2.6}
 %{?with_jasper:BuildRequires:  jasper-devel >= 1.700.5}
@@ -59,6 +60,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
@@ -635,6 +637,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
 
@@ -660,8 +665,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
@@ -756,6 +759,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/pcl.la
 %attr(755,root,root) %{modulesdir}/coders/pcx.so
 %{modulesdir}/coders/pcx.la
+%attr(755,root,root) %{modulesdir}/coders/pes.so
+%{modulesdir}/coders/pes.la
 %attr(755,root,root) %{modulesdir}/coders/pdb.so
 %{modulesdir}/coders/pdb.la
 %attr(755,root,root) %{modulesdir}/coders/pict.so
@@ -873,11 +878,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) %ghost %{_libdir}/libMagickCore.so.3
 %attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.2
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.3
 
 %if %{with djvu}
 %files coder-djvu
@@ -1030,7 +1035,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
+%attr(755,root,root) %ghost %{_libdir}/libMagick++.so.3
 
 %files c++-devel
 %defattr(644,root,root,755)