- updated to 6.5.4-5

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f4566d415dd6a3ed9ead47b0862ffaed77be164f..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.3.6
-%define                pver    4
+%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
@@ -24,21 +24,19 @@ 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:       4
+Release:       1
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5: 3a1cc470ee49b66ccc913414ba4336f5
-#Source0:      http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
+# Source0-md5: 598b85a24027e4583a850fbabf4f0b91
 Patch0:                %{name}-ac.patch
-Patch1:                %{name}-system-libltdl.patch
-Patch2:                %{name}-link.patch
-Patch3:                %{name}-libpath.patch
-Patch4:                %{name}-ldflags.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}
@@ -578,12 +576,11 @@ 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
 %patch3 -p1
-%patch4 -p1
 
 %{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
 find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
@@ -633,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
@@ -665,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
@@ -679,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
@@ -697,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
@@ -815,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
@@ -830,8 +845,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/animate
 %attr(755,root,root) %{_bindir}/compare
 %attr(755,root,root) %{_bindir}/composite
-%attr(755,root,root) %{_bindir}/convert
 %attr(755,root,root) %{_bindir}/conjure
+%attr(755,root,root) %{_bindir}/convert
 %attr(755,root,root) %{_bindir}/display
 %attr(755,root,root) %{_bindir}/identify
 %attr(755,root,root) %{_bindir}/import
@@ -858,9 +873,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE NEWS
-%attr(755,root,root) %{_libdir}/libMagick.so.*.*.*
-%attr(755,root,root) %{_libdir}/libWand.so.*.*.*
+%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand.so.2
 
 %if %{with djvu}
 %files coder-djvu
@@ -975,22 +992,29 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick-config
+%attr(755,root,root) %{_bindir}/MagickCore-config
+%attr(755,root,root) %{_bindir}/MagickWand-config
 %attr(755,root,root) %{_bindir}/Wand-config
-%attr(755,root,root) %{_libdir}/libMagick.so
-%attr(755,root,root) %{_libdir}/libWand.so
-%{_libdir}/libMagick.la
-%{_libdir}/libWand.la
-%{_includedir}/magick
-%{_includedir}/wand
+%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
+%{_includedir}/ImageMagick/wand
 %{_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*
 %{_mandir}/man1/Wand-config.1*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libMagick.a
-%{_libdir}/libWand.a
+%{_libdir}/libMagickCore.a
+%{_libdir}/libMagickWand.a
 
 %files perl
 %defattr(644,root,root,755)
@@ -1006,15 +1030,17 @@ 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)
 %attr(755,root,root) %{_bindir}/Magick++-config
 %{_libdir}/libMagick++.la
 %attr(755,root,root) %{_libdir}/libMagick++.so
-%{_includedir}/Magick++
-%{_includedir}/Magick++.h
+%{_includedir}/ImageMagick/Magick++
+%{_includedir}/ImageMagick/Magick++.h
 %{_pkgconfigdir}/ImageMagick++.pc
+%{_pkgconfigdir}/Magick++.pc
 %{_mandir}/man1/Magick++-config.1*
 
 %files c++-static