- updated to 6.5.4-5

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 31887c5e6e6944ec9b56003b1621f991f3b89081..2ffe01582b9c2cc183080faeeb7a276fa09caf53 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -10,8 +10,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.4
+%define                pver    5
 %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 +29,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: 598b85a24027e4583a850fbabf4f0b91
 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}
@@ -380,18 +379,6 @@ Bibliotecas estáticas para desenvolvimento com libMagick++.
 Це окремий пакет зі статичними бібліотеками, які більше не входять до
 складу ImageMagick-c++-devel.
 
-%package coder-braille
-Summary:       Coder module for braille BRF files
-Summary(pl.UTF-8):     Moduł kodera dla plików braille BRF
-Group:         X11/Applications/Graphics
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description coder-braille
-Coder module for braille BRF files.
-
-%description coder-braille -l pl
-Moduł kodera dla plików braille BRF.
-
 %package coder-djvu
 Summary:       Coder module for DJVU files
 Summary(pl.UTF-8):     Moduł kodera dla plików DJVU
@@ -404,18 +391,6 @@ Coder module for DJVU files.
 %description coder-djvu -l pl
 Moduł kodera dla plików DJVU.
 
-%package coder-dds
-Summary:       Coder module for MS Direct Draw Surface files
-Summary(pl.UTF-8):     Moduł kodera dla plików MS Direct Draw Surface
-Group:         X11/Applications/Graphics
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description coder-dds
-Coder module for MS Direct Draw Surface files.
-
-%description coder-dds -l pl.UTF-8
-Moduł kodera dla plików MS Direct Draw Surface.
-
 %package coder-dot
 Summary:       Coder module for GraphViz DOT files
 Summary(pl.UTF-8):     Moduł kodera dla plików GraphViz DOT
@@ -600,20 +575,8 @@ Coder module for WMF files.
 %description coder-wmf -l pl.UTF-8
 Moduł kodera dla plików WMF.
 
-%package coder-xps
-Summary:       Coder module for MS XML Paper Specification files
-Summary(pl.UTF-8):     Moduł kodera dla plików MS XML Paper Specification
-Group:         X11/Applications/Graphics
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description coder-xps
-Coder module for MS XML Paper Specification files.
-
-%description coder-xps -l pl.UTF-8
-Moduł kodera dla plików MS XML Paper Specification.
-
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q -n %{name}-%{ver}-%{pver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -667,6 +630,10 @@ 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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -699,8 +666,12 @@ rm -rf $RPM_BUILD_ROOT
 %{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
@@ -713,6 +684,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
@@ -731,14 +704,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
@@ -849,6 +828,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
@@ -894,13 +875,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog LICENSE
 %attr(755,root,root) %{_libdir}/libMagickCore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore.so.2
 %attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
-
-%files coder-braille
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/braille.so
-%{modulesdir}/coders/braille.la
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.2
 
 %if %{with djvu}
 %files coder-djvu
@@ -916,12 +893,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/dot.so
 %{modulesdir}/coders/dot.la
 
-%files coder-dds
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/dds.so
-%{modulesdir}/coders/dds.la
-
 %if %{with exr}
 %files coder-exr
 %defattr(644,root,root,755)
@@ -1018,12 +989,6 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/wmf.la
 %endif
 
-%files coder-xps
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/xps.so
-%{modulesdir}/coders/xps.la
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick-config
@@ -1032,6 +997,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
@@ -1064,6 +1030,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)