- rebuild

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index fe00cf3ec2156668b5a19ba2dd410dcdcdc39fde..a5aedf9222153d919e9b66d810ddd723f5e9c498 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,51 +1,62 @@
+#
+# Conditional build:
+# _without_fpx         - without FlashPIX module (which uses fpx library)
+# _with_gs             - with PostScript support through ghostscript library (warning: breaks jpeg!)
+# _without_jasper      - without JPEG2000 module (which uses jasper library)
+# _without_cxx          - without Magick++
+#

 %include       /usr/lib/rpm/macros.perl
 %include       /usr/lib/rpm/macros.perl

+%define                ver 5.5.4
+%define                pver    2
+%define                iver 5.5.4-Q16

 Summary:       Image display, conversion, and manipulation under X
 Summary(de):   Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
 Summary:       Image display, conversion, and manipulation under X
 Summary(de):   Darstellen, Konvertieren und Bearbeiten von Grafiken unter X

+Summary(es):   Exhibidor, convertidor y manipulador de imágenes bajo X

 Summary(fr):   Visualisation, conversion, et manipulation d'images sous X
 Summary(pl):   Narzêdzie do wy¶wietlania, konwersji i manipulacji grafikami
 Summary(fr):   Visualisation, conversion, et manipulation d'images sous X
 Summary(pl):   Narzêdzie do wy¶wietlania, konwersji i manipulacji grafikami

+Summary(pt_BR):        Exibidor, conversor e manipulador de imagens sob X
+Summary(ru):   ðÒÏÓÍÏÔÒ, ËÏÎ×ÅÒÔÉÒÏ×ÁÎÉÅ, ÏÂÒÁÂÏÔËÁ ÉÚÏÂÒÁÖÅÎÉÊ ÐÏÄ X Windows

 Summary(tr):   X altýnda resim gösterme, çevirme ve deðiþiklik yapma
 Summary(tr):   X altýnda resim gösterme, çevirme ve deðiþiklik yapma

+Summary(uk):   ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä X Windows

 Name:          ImageMagick
 Name:          ImageMagick

-Version:       5.3.4
+Version:       %{ver}%{?pver:.%{pver}}

 Release:       2
 Epoch:         1
 License:       Freeware
 Group:         X11/Applications/Graphics
 Release:       2
 Epoch:         1
 License:       Freeware
 Group:         X11/Applications/Graphics

-Group(de):     X11/Applikationen/Grafik
-Group(pl):     X11/Aplikacje/Grafika
-Source0:       ftp://ftp.simplesystems.org/pub/ImageMagick/%{name}-%{version}.tar.gz
+Source0:       http://imagemagick.sourceforge.net/http/%{name}-%{ver}%{?pver:-%{pver}}.tar.bz2

 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-perlpaths.patch
 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-perlpaths.patch

-Patch2:                %{name}-delegates-destdir.patch
-Patch3:                %{name}-libwmf.patch
-Patch4:                %{name}-perl-link.patch
+Patch2:                %{name}-ac.patch
+Patch3:                %{name}-system-libltdl.patch
+Patch4:                %{name}-dps.patch

 URL:           http://www.imagemagick.org/
 URL:           http://www.imagemagick.org/

-BuildRequires: rpm-perlprov >= 3.0.3-18
-BuildRequires: XFree86-devel

 BuildRequires: XFree86-DPS-devel
 BuildRequires: XFree86-DPS-devel

+BuildRequires: XFree86-devel
+BuildRequires: autoconf >= 2.56
+BuildRequires: automake >= 1.7

 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: bzip2-devel >= 1.0.1

+%{!?_without_fpx:BuildRequires:        libfpx-devel >= 1.2.0.4-2}

 BuildRequires: freetype-devel >= 2.0.2-2
 BuildRequires: freetype-devel >= 2.0.2-2

+%{?_with_gs:BuildRequires:     ghostscript-devel}
+%{!?_without_jasper:BuildRequires:     jasper-devel}
+BuildRequires: jbigkit-devel
+BuildRequires: lcms-devel

 BuildRequires: libjpeg-devel
 BuildRequires: libjpeg-devel

-BuildRequires: libtiff-devel
+BuildRequires: libltdl-devel
+BuildRequires: libplot-devel

 BuildRequires: libpng >= 1.0.8
 BuildRequires: libstdc++-devel
 BuildRequires: libpng >= 1.0.8
 BuildRequires: libstdc++-devel

-BuildRequires: libwmf-devel
-BuildRequires: libtool
+BuildRequires: libtiff-devel
+BuildRequires: libtool >= 2:1.4e-0.20021218.3
+BuildRequires: libwmf-devel >= 0.2.2
+BuildRequires: libxml2-devel >= 2.0

 BuildRequires: perl-devel >= 5.6.1
 BuildRequires: perl-devel >= 5.6.1

-#BuildRequires:        libxml2-devel >= 2.0
-#BuildRequires:        lcms-devel
-#BuildRequires:        fpx-devel
-#BuildRequires:        hdf-devel
-#BuildRequires:        jbigkit-devel
-BuildRequires: autoconf
-BuildRequires: automake >= 1.4d
+BuildRequires: rpm-perlprov >= 3.0.3-18

 Requires:      %{name}-libs = %{version}
 Requires:      %{name}-libs = %{version}

+Obsoletes:     %{name}-coder-mpeg

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _includedir     %{_prefix}/include/X11
-%define                _perlmandir     /usr/share/man
-

 %description
 ImageMagick is an image display, conversion, and manipulation tool. It
 runs under X windows. It is very powerful in terms of it's ability to
 %description
 ImageMagick is an image display, conversion, and manipulation tool. It
 runs under X windows. It is very powerful in terms of it's ability to


@@ -58,6 +69,12 @@ manipulation, -das unter X-Windows l
 in Bezug auf die Grafikmanipulationsfunktionen, die es dem Anwender
 bietet, und auf die Vielfalt der unterstützten Formate.
 
 in Bezug auf die Grafikmanipulationsfunktionen, die es dem Anwender
 bietet, und auf die Vielfalt der unterstützten Formate.
 

+%description -l es
+ImageMagick es una herramienta para manipular, convertir y exhibir
+imágenes, que funciona bajo X Window. Es una herramienta potente que
+permite editar imágenes, pudiendo manipular varios formatos
+diferentes.
+

 %description -l fr
 ImageMagick est un outil d'affichage, de conversion et de manipulation
 d'images. Il tourne sous X Window et est très puissant en termes de
 %description -l fr
 ImageMagick est un outil d'affichage, de conversion et de manipulation
 d'images. Il tourne sous X Window et est très puissant en termes de


@@ -65,70 +82,141 @@ capacit
 différents.
 
 %description -l pl
 différents.
 
 %description -l pl

-ImageMagick jest narzêdziem do manipulacji, konwersji i wy¶wietlania. W
-sk³ad pakietu wchodz± zarówno narzêdzia X Window jak i do u¿ywania z
+ImageMagick jest narzêdziem do manipulacji, konwersji i wy¶wietlania.
+W sk³ad pakietu wchodz± zarówno narzêdzia X Window jak i do u¿ywania z

 linii poleceñ umo¿liwiaj±ce edycjê plików graficznych. Narzêdzia z
 pakietu ImageMagick potrafi± obs³u¿yæ wiele ró¿nych formatów
 graficznych.
 
 linii poleceñ umo¿liwiaj±ce edycjê plików graficznych. Narzêdzia z
 pakietu ImageMagick potrafi± obs³u¿yæ wiele ró¿nych formatów
 graficznych.
 

+%description -l pt_BR
+ImageMagick é uma ferramenta para manipular, converter e exibir
+imagens, que funciona sob o X Window. É uma ferramenta poderosa que
+permite editar imagens, podendo tratar vários formatos diferentes.
+
+%description -l ru
+ImageMagick - ÜÔÏ ÕÔÉÌÉÔÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ, ËÏÎ×ÅÒÔÉÒÏ×ÁÎÉÑ É ÏÂÒÁÂÏÔËÉ
+ÉÚÏÂÒÁÖÅÎÉÊ. ïÎÁ ÒÁÂÏÔÁÅÔ ÐÏÄ X Windows. ImageMagick ÐÒÅÄÏÓÔÁ×ÌÑÅÔ
+ÐÏÌØÚÏ×ÁÔÅÌÀ ÛÉÒÏËÉÅ ×ÏÚÍÏÖÎÏÓÔÉ ÐÏ ÏÂÒÁÂÏÔËÅ ÉÚÏÂÒÁÖÅÎÉÊ × ÓÁÍÙÈ
+ÒÁÚÎÏÏÂÒÁÚÎÙÈ ÆÏÒÍÁÔÁÈ.
+

 %description -l tr
 ImageMagick bir resim gösterme, çevirme ve deðiþiklik yapma
 programýdýr. X Window pencereleme sistemi altýnda çalýþýr. Kullanýcýya
 resimler üzerinde deðiþiklik yapma açýsýndan pek çok olanak sunar. Bir
 çok resim biçimini rahatlýkla kullanabilir.
 
 %description -l tr
 ImageMagick bir resim gösterme, çevirme ve deðiþiklik yapma
 programýdýr. X Window pencereleme sistemi altýnda çalýþýr. Kullanýcýya
 resimler üzerinde deðiþiklik yapma açýsýndan pek çok olanak sunar. Bir
 çok resim biçimini rahatlýkla kullanabilir.
 

+%description -l uk
+ImageMagick - ÃÅ ÕÔÉ̦ÔÁ ÄÌÑ ÐÅÒÅÇÌÑÄÕ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÉ
+ÚÏÂÒÁÖÅÎØ. ÷ÏÎÁ ÐÒÁÃÀ¤ Ð¦Ä X Windows. ImageMagick ÄÁ¤ ËÏÒÉÓÔÕ×ÁÞÕ
+ÛÉÒÏ˦ ÍÏÖÌÉ×ÏÓÔ¦ ÐÏ ÏÂÒÏÂæ ÚÏÂÒÁÖÅÎØ × Ò¦ÚÎÏÍÁΦÔÎÉÈ ÆÏÒÍÁÔÁÈ.
+
+%package libs
+Summary:       ImageMagick libraries
+Summary(pl):   Biblioteki ImageMagick
+Summary(pt_BR):        Bibliotecas dinâmicas do ImageMagick
+Group:         X11/Libraries
+
+%description libs
+ImageMagick libraries.
+
+%description libs -l pl
+Biblioteki ImageMagick.
+
+%description libs -l pt_BR
+Bibliotecas dinâmicas do ImageMagick.
+

 %package devel
 Summary:       Libraries and header files for ImageMagick development
 %package devel
 Summary:       Libraries and header files for ImageMagick development

+Summary(es):   Biblioteca estática y archivos de inclusión para desarrollo con libMagick

 Summary(pl):   Biblioteki i pliki nag³ówkowe dla ImageMagick
 Summary(pl):   Biblioteki i pliki nag³ówkowe dla ImageMagick

+Summary(pt_BR):        Biblioteca e arquivos de inclusão para desenvolvimento com libMagick
+Summary(ru):   èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ImageMagick
+Summary(uk):   èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick

 Group:         X11/Development/Libraries
 Group:         X11/Development/Libraries

-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki

 Requires:      %{name} = %{version}
 Requires:      %{name} = %{version}

+Requires:      XFree86-devel
+Requires:      freetype-devel
+Requires:      lcms-devel
+Requires:      zlib-devel

 
 %description devel
 This is the ImageMagick development package. It includes header files
 for use in developing your own applications that make use of the
 ImageMagick code and/or APIs.
 
 
 %description devel
 This is the ImageMagick development package. It includes header files
 for use in developing your own applications that make use of the
 ImageMagick code and/or APIs.
 

-%description -l de devel
-Dies ist das ImageMagick-Entwicklerpaket. Es enthält Header-Dateien zum
-Entwickeln von Anwendungen, die ImageMagick-Code und/oder -APIs nutzen.
+%description devel -l de
+Dies ist das ImageMagick-Entwicklerpaket. Es enthält Header-Dateien
+zum Entwickeln von Anwendungen, die ImageMagick-Code und/oder -APIs
+nutzen.
+
+%description devel -l es
+Este es el paquete de desarrollo ImageMagick. Incluye las bibliotecas
+y los archivos de inclusión para el desarrollo de sus propias
+aplicaciones que hacen uso del código ImageMagick y/el APIs.

 
 

-%description -l fr devel
+%description devel -l fr

 Paquetage de développement ImageMagick. Contient les bibliothèques
 statiques et les en-têtes utilisés pour créer vos propres applications
 utilisant le code d'ImageMagick et/ou ses APIs.
 
 Paquetage de développement ImageMagick. Contient les bibliothèques
 statiques et les en-têtes utilisés pour créer vos propres applications
 utilisant le code d'ImageMagick et/ou ses APIs.
 

-%description -l pl devel
+%description devel -l pl

 Pakiet ten zawieraja pliki potrzebne przy kompilowaniu programów
 Pakiet ten zawieraja pliki potrzebne przy kompilowaniu programów

-wykorzystuj±cych blibliotekê ImageMagick takie jak pliki nag³ówkowe
-i dokumentacjê niezbêdn± przy pisaniu w³asnych programów
-z wykorzystaniem API jakie udostêpnia ImageMagick.
+wykorzystuj±cych blibliotekê ImageMagick takie jak pliki nag³ówkowe i
+dokumentacjê niezbêdn± przy pisaniu w³asnych programów z
+wykorzystaniem API jakie udostêpnia ImageMagick.
+
+%description devel -l pt_BR
+Este é o pacote de desenvolvimento ImageMagick. Inclui as bibliotecas
+e os arquivos de inclusão para o desenvolvimento de suas próprias
+aplicações que fazem uso do código ImageMagick e/ou APIs.

 
 

-%description -l tr devel
+%description devel -l ru
+üÔÏ ÐÁËÅÔ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ImageMagick. ïÎ ×ËÌÀÞÁÅÔ
+ÈÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÐÒÏÇÒÁÍÍÁÈ, ËÏÔÏÒÙÅ ÉÓÐÏÌØÚÕÀÔ
+ËÏÄ ÉÌÉ API ImageMagick.
+
+%description devel -l tr

 Bu paket, ImageMagick uygulama arayüzünü kullanan programlar
 geliþtirmek için gereken baþlýk dosyalarýný ve kitaplýklarý içerir.
 
 Bu paket, ImageMagick uygulama arayüzünü kullanan programlar
 geliþtirmek için gereken baþlýk dosyalarýný ve kitaplýklarý içerir.
 

+%description devel -l uk
+ãÅ ÐÁËÅÔ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick. ÷¦Î ͦÓÔÉÔØ ÈÅÄÅÒÉ ÔÁ
+¦Â̦ÏÔÅËÉ ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ × ÐÒÏÇÒÁÍÁÈ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ËÏÄ ÁÂÏ API
+ImageMagick.
+

 %package static
 Summary:       ImageMagick static libraries
 Summary(pl):   Biblioteki statyczne ImageMagick
 %package static
 Summary:       ImageMagick static libraries
 Summary(pl):   Biblioteki statyczne ImageMagick

+Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com libMagick
+Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ImageMagick
+Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick

 Group:         X11/Development/Libraries
 Group:         X11/Development/Libraries

-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki

 Requires:      %{name}-devel = %{version}
 
 %description static
 ImageMagick static libraries.
 
 Requires:      %{name}-devel = %{version}
 
 %description static
 ImageMagick static libraries.
 

-%description -l pl devel
+%description static -l pl

 Biblioteki statyczne ImageMagick.
 
 Biblioteki statyczne ImageMagick.
 

+%description static -l pt_BR
+Bibliotecas estáticas para desenvolvimento com libMagick.
+
+%description static -l ru
+üÔÏ ÏÔÄÅÌØÎÙÊ ÐÁËÅÔ ÓÏ ÓÔÁÔÉÞÅÓËÉÍÉ ÂÉÂÌÉÏÔÅËÁÍÉ, ËÏÔÏÒÙÅ ÂÏÌØÛÅ ÎÅ
+×ÈÏÄÑÔ × ImageMagick-devel.
+
+%description static -l uk
+ãÅ ÏËÒÅÍÉÊ ÐÁËÅÔ Ú¦ ÓÔÁÔÉÞÎÉÍÉ Â¦Â̦ÏÔÅËÁÍÉ, Ñ˦ ¦ÌØÛÅ ÎÅ ×ÈÏÄÑÔØ ÄÏ
+ÓËÌÁÄÕ ImageMagick-devel.
+

 %package perl
 %package perl

-Summary:       libraries and modules for access to ImageMagick from perl
-Summary(pl):   Biblioteki i modu³y perl dla ImageMagick
+Summary:       Libraries and modules for access to ImageMagick from perl
+Summary(pl):   Biblioteki i modu³y perla dla ImageMagick
+Summary(pt_BR):        Módulo perl para uso com o ImageMagick
+Summary(ru):   âÉÂÌÉÏÔÅËÉ É ÍÏÄÕÌÉ ÄÌÑ ÄÏÓÔÕÐÁ Ë ImageMagick ÉÚ perl
+Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÍÏÄÕ̦ ÄÌÑ ÄÏÓÔÕÐÕ ÄÏ ImageMagick Ú Perl

 Group:         Development/Languages/Perl
 Group:         Development/Languages/Perl

-Group(de):     Entwicklung/Sprachen/Perl
-Group(pl):     Programowanie/Jêzyki/Perl

 Requires:      %{name}-libs = %{version}
 
 %description perl
 Requires:      %{name}-libs = %{version}
 
 %description perl


@@ -136,29 +224,29 @@ This is the ImageMagick perl support package. It perl modules and
 support files for access to ImageMagick library from perl without
 unuseful forking or such.
 
 support files for access to ImageMagick library from perl without
 unuseful forking or such.
 

-%description -l pl perl
-Biblioteki i modu³y umo¿liwiaj±ce korzystanie z ImageMagick z
-poziomu perla.
+%description perl -l pl
+Biblioteki i modu³y umo¿liwiaj±ce korzystanie z ImageMagick z poziomu
+perla.

 
 

-%package libs
-Summary:       ImageMagick libraries
-Summary(pl):   Biblioteki ImageMagick
-Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(pl):     X11/Biblioteki
+%description perl -l pt_BR
+Este pacote fornece um módulo perl para acessar funções do ImageMagick
+em scripts perl.

 
 

-%description libs
-ImageMagick libraries.
+%description perl -l ru
+üÔÏ ÐÁËÅÔ ImageMagick ÄÌÑ ÐÏÄÄÅÒÖËÉ perl. ïÎ ×ËÌÀÞÁÅÔ ÍÏÄÕÌÉ perl É
+×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÆÁÊÌÙ ÄÌÑ ÄÏÓÔÕÐÁ Ë ÂÉÂÌÉÏÔÅËÅ ImageMagick ÉÚ perl.

 
 

-%description -l pl libs
-Biblioteki ImageMagick.
+%description perl -l uk
+ãÅ ÐÁËÅÔ ImageMagick ÄÌÑ Ð¦ÄÔÒÉÍËÉ Perl. ÷¦Î ͦÓÔÉÔØ ÍÏÄÕ̦ Perl ÔÁ
+ÄÏÄÁÔËÏצ ÆÁÊÌÉ ÄÌÑ ÄÏÓÔÕÐÕ ÄÏ Â¦Â̦ÏÔÅËÉ ImageMagick Ú Perl.

 
 %package c++
 Summary:       ImageMagick Magick++ library
 Summary(pl):   Biblioteka Magick++
 
 %package c++
 Summary:       ImageMagick Magick++ library
 Summary(pl):   Biblioteka Magick++

+Summary(pt_BR):        Bibliotecas dinâmicas do ImageMagick
+Summary(ru):   âÉÂÌÉÏÔÅËÁ Magick++ (C++ ÉÎÔÅÒÆÅÊÓ ÄÌÑ ImageMagick'Á)
+Summary(uk):   â¦Â̦ÏÔÅËÁ Magick++ (¦ÎÔÅÒÆÅÊÓ C++ ÄÌÑ ImageMagick)

 Group:         X11/Libraries
 Group:         X11/Libraries

-Group(de):     X11/Libraries
-Group(pl):     X11/Biblioteki

 Requires:      %{name}-libs = %{version}
 
 %description c++
 Requires:      %{name}-libs = %{version}
 
 %description c++


@@ -168,17 +256,32 @@ ImageMagick graphics manipulation library.
 Install ImageMagick-c++ if you want to use any applications that use
 Magick++.
 
 Install ImageMagick-c++ if you want to use any applications that use
 Magick++.
 

-%description -l pl c++
+%description c++ -l pl

 Pakiet zawiera bibliotekê Magick++ - interfejs w C++ do biblioteki
 Pakiet zawiera bibliotekê Magick++ - interfejs w C++ do biblioteki

-ImageMagick. Jest potrzebny do uruchamiania programów korzystaj±cych
-z Magick++.
+ImageMagick. Jest potrzebny do uruchamiania programów korzystaj±cych z
+Magick++.
+
+%description c++ -l pt_BR
+Bibliotecas dinâmicas C++ do ImageMagick.
+
+%description c++ -l ru
+Magick++ -- ÏÂßÅËÔÎÏ-ÏÒÉÅÎÔÉÒÏ×ÁÎÎÁÑ ÂÉÂÌÉÏÔÅËÁ, ÐÒÅÄÓÔÁ×ÌÑÀÝÁÑ ÉÚ
+ÓÅÂÑ C++ API ÄÌÑ ImageMagick (ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÓÍÏÔÒÁ,
+ËÏÎ×ÅÒÔÉÒÏ×ÁÎÉÑ É ÏÂÒÁÂÏÔËÉ ÉÚÏÂÒÁÖÅÎÉÊ).
+
+%description c++ -l uk
+Magick++ -- ÏÂ'¤ËÔÏ-ÏÒ¦¤ÎÔÏ×ÁÎÁ ¦Â̦ÏÔÅËÁ, ÝÏ Ñ×ÌѤ ÓÏÂÏÀ C++ API ÄÌÑ
+ImageMagick (¦Â̦ÏÔÅËÉ ÄÌÑ ÐÅÒÅÇÌÑÄÕ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÉ
+ÚÏÂÒÁÖÅÎØ).

 
 %package c++-devel
 Summary:       C++ bindings for the ImageMagick library
 
 %package c++-devel
 Summary:       C++ bindings for the ImageMagick library

+Summary(es):   Biblioteca estática y archivos de inclusión para desarrollo con libMagick++

 Summary(pl):   Pliki nag³ówkowe z interfejsem C++ do ImageMagick
 Summary(pl):   Pliki nag³ówkowe z interfejsem C++ do ImageMagick

+Summary(pt_BR):        Biblioteca e arquivos de inclusão para desenvolvimento com libMagick++
+Summary(ru):   èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔÏË Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Magick++ (C++ ÉÎÔÅÒÆÅÊÓ ÄÌÑ ImageMagick'Á)
+Summary(uk):   èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂÏË Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ Magick++ (¦ÎÔÅÒÆÅÊÓÕ C++ ÄÌÑ ImageMagick)

 Group:         X11/Development/Libraries
 Group:         X11/Development/Libraries

-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki

 Requires:      %{name}-c++ = %{version}
 Requires:      %{name}-devel = %{version}
 
 Requires:      %{name}-c++ = %{version}
 Requires:      %{name}-devel = %{version}
 


@@ -193,66 +296,290 @@ and ImageMagick. You don't need to install it if you just want to use
 ImageMagick, or if you want to develop/compile applications using the
 ImageMagick C interface, however.
 
 ImageMagick, or if you want to develop/compile applications using the
 ImageMagick C interface, however.
 

-%description -l pl c++-devel
+%description c++-devel -l es
+Este es el paquete de desarrollo ImageMagick. Incluye las bibliotecas
+estáticas y los archivos de inclusión para el desarrollo de sus
+propias aplicaciones que hacen uso del código ImageMagick y/el APIs.
+
+%description c++-devel -l pl

 Pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania programów
 korzystaj±cych z Magick++.
 
 Pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania programów
 korzystaj±cych z Magick++.
 

+%description c++-devel -l pt_BR
+Este é o pacote de desenvolvimento libMagick++. Inclui as bibliotecas
+e os arquivos de inclusão para o desenvolvimento de suas próprias
+aplicações C++ que fazem uso do código ImageMagick e/ou APIs.
+
+%description c++-devel -l ru
+üÔÏ ÐÁËÅÔ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ImageMagick. ïÎ ×ËÌÀÞÁÅÔ
+ÈÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÐÒÏÇÒÁÍÍÁÈ, ËÏÔÏÒÙÅ ÉÓÐÏÌØÚÕÀÔ
+ËÏÄ ÉÌÉ API Magick++ (C++ ÉÎÔÅÒÆÅÊÓ ÄÌÑ ImageMagick'Á).
+
+%description c++-devel -l uk
+ãÅ ÐÁËÅÔ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick. ÷¦Î ͦÓÔÉÔØ ÈÅÄÅÒÉ ÔÁ
+¦Â̦ÏÔÅËÉ ÄÌÑ ×ÉËÏÒÉÓÔÁÎÎÑ × ÐÒÏÇÒÁÍÁÈ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ËÏÄ ÁÂÏ API
+Magick++ (¦ÎÔÅÒÆÅÊÓ C++ ÄÌÑ ImageMagick).
+

 %package c++-static
 Summary:       C++ bindings for the ImageMagick - static library
 Summary(pl):   Interfejs C++ do ImageMagick - biblioteka statyczna
 %package c++-static
 Summary:       C++ bindings for the ImageMagick - static library
 Summary(pl):   Interfejs C++ do ImageMagick - biblioteka statyczna

+Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com libMagick
+Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ C++ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó ImageMagick
+Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ C++ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick

 Group:         X11/Development/Libraries
 Group:         X11/Development/Libraries

-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki

 Requires:      %{name}-c++-devel = %{version}
 Requires:      %{name}-devel = %{version}
 
 %description c++-static
 C++ bindings for the ImageMagick - static library.
 
 Requires:      %{name}-c++-devel = %{version}
 Requires:      %{name}-devel = %{version}
 
 %description c++-static
 C++ bindings for the ImageMagick - static library.
 

-%description -l pl c++-static
+%description c++-static -l pl

 Biblioteka Magick++ w wersji statycznej.
 
 Biblioteka Magick++ w wersji statycznej.
 

+%description c++-static -l pt_BR
+Bibliotecas estáticas para desenvolvimento com libMagick++.
+
+%description c++-static -l ru
+üÔÏ ÏÔÄÅÌØÎÙÊ ÐÁËÅÔ ÓÏ ÓÔÁÔÉÞÅÓËÉÍÉ ÂÉÂÌÉÏÔÅËÁÍÉ, ËÏÔÏÒÙÅ ÂÏÌØÛÅ ÎÅ
+×ÈÏÄÑÔ × ImageMagick-c++-devel.
+
+%description c++-static -l uk
+ãÅ ÏËÒÅÍÉÊ ÐÁËÅÔ Ú¦ ÓÔÁÔÉÞÎÉÍÉ Â¦Â̦ÏÔÅËÁÍÉ, Ñ˦ ¦ÌØÛÅ ÎÅ ×ÈÏÄÑÔØ ÄÏ
+ÓËÌÁÄÕ ImageMagick-c++-devel.
+
+%package coder-dps
+Summary:       Coder module for Postscript files using DPS extension
+Summary(pl):   Modu³ kodera dla plików Postscript u¿ywaj±cy rozszerzenia DPS
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-dps
+Coder module for Postcript files using DPS (Display PostScript)
+extension.
+
+%description coder-dps -l pl
+Modu³ kodera dla plików Postscript u¿ywaj±cy rozszerzenia DPS (Display
+PostScript).
+
+%package coder-fpx
+Summary:       Coder module for FlashPIX (FPX) files
+Summary(pl):   Modu³ kodera dla plików FlashPIX (FPX)
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-fpx
+Coder module for FlashPIX (FPX) files.
+
+%description coder-fpx -l pl
+Modu³ kodera dla plików FlashPIX (FPX).
+
+%package coder-jbig
+Summary:       Coder module for JBIG files
+Summary(pl):   Modu³ kodera dla plików JBIG
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-jbig
+Coder module for JBIG files.
+
+%description coder-jbig -l pl
+Modu³ kodera dla plików JBIG.
+
+%package coder-jpeg
+Summary:       Coder module for JPEG files
+Summary(pl):   Modu³ kodera dla plików JPEG
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-jpeg
+Coder module for JPEG files.
+
+%description coder-jpeg -l pl
+Modu³ kodera dla plików JPEG.
+
+%package coder-jpeg2
+Summary:       Coder module for JPEG-2000 (JP2/JPC) files using JasPer library
+Summary(pl):   Modu³ kodera dla plików JPEG-2000 (JP2/JPC) u¿ywaj±cy biblioteki JasPer
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-jpeg2
+Coder module for JPEG-2000 (JP2/JPC) files using JasPer library.
+
+%description coder-jpeg2 -l pl
+Modu³ kodera dla plików JPEG-2000 (JP2/JPC) u¿ywajacy biblioteki
+JasPer.
+
+%package coder-miff
+Summary:       Coder module for MIFF files
+Summary(pl):   Modu³ kodera dla plików MIFF
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-miff
+Coder module for MIFF files.
+
+%description coder-miff -l pl
+Modu³ kodera dla plików MIFF.
+
+%package coder-mpeg
+Summary:       Coder module for MPEG files
+Summary(pl):   Modu³ kodera dla plików MPEG
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-mpeg
+Coder module for MPEG files.
+
+%description coder-mpeg -l pl
+Modu³ kodera dla plików MPEG.
+
+%package coder-mpr
+Summary:       Coder module for ImageMagick MPR and MSL files
+Summary(pl):   Modu³ kodera dla plików MPR i MSL ImageMagick
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-mpr
+Coder module for Magick Persistent Registry (MPR) and Magick Scripting
+Language (MSL) files.
+
+%description coder-mpr -l pl
+Modu³ kodera dla plików Magick Persistent Registry (MPR) i Magick
+Scripting Language (MSL).
+
+%package coder-pdf
+Summary:       Coder module for PDF files
+Summary(pl):   Modu³ kodera dla plików PDF
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-pdf
+Coder module for PDF files.
+
+%description coder-pdf -l pl
+Modu³ kodera dla plików PDF.
+
+%package coder-png
+Summary:       Coder module for PNG files
+Summary(pl):   Modul kodera dla plików PNG
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-png
+Coder module for PNG files.
+
+%description coder-png -l pl
+Modu³ kodera dla plików PNG.
+
+%package coder-ps2
+Summary:       Coder module for Postscript Level II & III (PS2/PS3) files
+Summary(pl):   Modu³ kodera dla plików Postscript Level II i III (PS2/PS3)
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-ps2
+Coder module for Postscript Level II & III (PS2/PS3) files.
+
+%description coder-ps2 -l pl
+Modu³ kodera dla plików Postscript Level II i III (PS2/PS3).
+
+%package coder-svg
+Summary:       Coder module for SVG (Scalable Vector Graphics) files
+Summary(pl):   Modu³ kodera dla plików SVG (Scalable Vector Graphics)
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-svg
+Coder module for SVG (Scalable Vector Graphics) files.
+
+%description coder-svg -l pl
+Modu³ kodera dla plików SVG (Scalable Vector Graphics).
+
+%package coder-tiff
+Summary:       Coder module for TIFF files
+Summary(pl):   Modu³ kodera dla plików TIFF
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-tiff
+Coder module for TIFF files.
+
+%description coder-tiff -l pl
+Modu³ kodera dla plików TIFF.
+
+%package coder-url
+Summary:       Coder module for retrieving files via URL
+Summary(pl):   Modu³ kodera ¶ci±gaj±cy pliki o podanym URL
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-url
+Coder module for retrieving files via URL.
+
+%description coder-url -l pl
+Modu³ kodera ¶ci±gaj±cy pliki o podanym URL.
+
+%package coder-wmf
+Summary:       Coder module for WMF files
+Summary(pl):   Modu³ kodera dla plików WMF
+Group:         X11/Applications/Graphics
+Requires:      %{name} = %{version}
+
+%description coder-wmf
+Coder module for WMF files.
+
+%description coder-wmf -l pl
+Modu³ kodera dla plików WMF.
+

 %prep
 %prep

-%setup  -q
+%setup -q -n %{name}-%{ver}

 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 

-# fix typo
-perl -pi -e 's@htmlc\.@html.c@' coders/Makefile.am
-# fix lcms.h include path
-perl -pi -e 's@lcms/lcms\.h@lcms.h@' magick/transform.c
-

 %build
 %build

-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
+rm -f missing
+%{__libtoolize}
+%{__aclocal} -I /usr/share/libtool/libltdl
+%{__autoconf}
+%{__automake}
+CPPFLAGS="-I/usr/include/g++"

 %configure \
 %configure \

-       --enable-shared \
-       --enable-lzw \
+       CPPFLAGS="$CPPFLAGS" \

        --enable-16bit-pixel \
        --enable-16bit-pixel \

+       --enable-lzw \
+       --enable-shared \
+       --enable-fast-install \
+       --with-gs-font-dir=%{_fontsdir}/Type1 \
+       %{?_without_fpx:--without-fpx} \
+       %{!?_with_gs:--without-gslib} \
+       %{?_without_jasper:--without-jp2} \
+       --with%{?_without_cxx:out}-magick_plus_plus \

        --with-perl \
        --with-perl \

-       --with-ttf \
-       --with-x \

        --with-threads \
        --with-threads \

-       --with-magick_plus_plus
+       --with-ttf \
+       --with-modules \
+       --with-x

 
 

-%{__make} 
-%{__make} -C Magick++
+%{__make}
+%{!?_without_cxx:%{__make} -C Magick++}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 
 %{__make} install \
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 
 %{__make} install \

-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$RPM_BUILD_ROOT \
+       pkgdocdir=%{_defaultdocdir}/%{name}-devel-%{version}/

 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl

+rm -f $RPM_BUILD_ROOT/%{_libdir}/ImageMagick-%{iver}/modules/coders/*.a

 
 

-gzip -9nf README.txt
+%clean
+rm -rf $RPM_BUILD_ROOT

 
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig


@@ -260,40 +587,280 @@ gzip -9nf README.txt
 %post   c++ -p /sbin/ldconfig
 %postun c++ -p /sbin/ldconfig
 
 %post   c++ -p /sbin/ldconfig
 %postun c++ -p /sbin/ldconfig
 

-%clean
-rm -rf $RPM_BUILD_ROOT
-

 %files libs
 %defattr(644,root,root,755)
 %files libs
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libMagick.so.*.*
+%doc Copyright.txt
+%attr(755,root,root) %{_libdir}/libMagick-%{iver}.so.*.*

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%dir %{_datadir}/ImageMagick
-%{_datadir}/ImageMagick/*.mgk
-%dir %{_libdir}/ImageMagick
-%{_libdir}/ImageMagick/*.mgk
+%dir %{_libdir}/ImageMagick-%{iver}
+%{_libdir}/ImageMagick-%{iver}/*.mgk
+%dir %{_libdir}/ImageMagick-%{iver}/modules
+%dir %{_libdir}/ImageMagick-%{iver}/modules/coders
+
+# ========= coders without additional deps
+%{_libdir}/ImageMagick-%{iver}/modules/coders/art.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/art.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/avi.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/avi.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/avs.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/avs.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/bmp.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/bmp.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/caption.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/caption.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/cmyk.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/cmyk.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/cut.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/cut.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/dcm.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dcm.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/dib.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dib.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/dpx.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dpx.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/ept.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ept.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/fax.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fax.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/fits.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fits.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/gif.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gif.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/gradient.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gradient.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/gray.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/gray.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/histogram.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/histogram.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/html.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/html.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/icon.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/icon.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/label.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/label.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/locale.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/locale.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/logo.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/logo.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/map.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/map.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mat.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mat.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/matte.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/matte.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/meta.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/meta.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mono.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mono.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mpc.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpc.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mpeg.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpeg.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mtv.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mtv.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mvg.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mvg.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/null.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/null.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/otb.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/otb.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/palm.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/palm.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pcd.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcd.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pcl.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcl.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pcx.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pcx.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pdb.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pdb.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pict.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pict.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pix.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pix.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/plasma.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/plasma.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pnm.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pnm.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/preview.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/preview.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/psd.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/psd.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/ps.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pwp.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pwp.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/rgb.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rgb.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/rla.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rla.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/rle.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/rle.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/sct.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sct.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/sfw.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sfw.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/sgi.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sgi.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/stegano.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/stegano.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/sun.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/sun.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/tga.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tga.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/tile.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tile.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/tim.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tim.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/ttf.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ttf.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/txt.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/txt.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/uil.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/uil.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/uyvy.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/uyvy.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/vicar.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/vicar.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/vid.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/vid.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/viff.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/viff.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/wbmp.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wbmp.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/wpg.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wpg.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/xbm.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xbm.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/xcf.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xcf.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/xc.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xc.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/xpm.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xpm.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/x.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/x.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/xwd.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/xwd.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/yuv.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/yuv.so
+
+%{_libdir}/ImageMagick-%{iver}/modules/coders/*.mgk

 
 %attr(755,root,root) %{_bindir}/animate
 
 %attr(755,root,root) %{_bindir}/animate

-%attr(755,root,root) %{_bindir}/cgimagick

 %attr(755,root,root) %{_bindir}/composite
 %attr(755,root,root) %{_bindir}/convert
 %attr(755,root,root) %{_bindir}/composite
 %attr(755,root,root) %{_bindir}/convert

+%attr(755,root,root) %{_bindir}/conjure

 %attr(755,root,root) %{_bindir}/display
 %attr(755,root,root) %{_bindir}/identify
 %attr(755,root,root) %{_bindir}/import
 %attr(755,root,root) %{_bindir}/display
 %attr(755,root,root) %{_bindir}/identify
 %attr(755,root,root) %{_bindir}/import

-%attr(755,root,root) %{_bindir}/iptcutil

 %attr(755,root,root) %{_bindir}/mogrify
 %attr(755,root,root) %{_bindir}/montage
 
 %{_mandir}/man1/[Iacdim]*
 
 %attr(755,root,root) %{_bindir}/mogrify
 %attr(755,root,root) %{_bindir}/montage
 
 %{_mandir}/man1/[Iacdim]*
 

+%files coder-dps
+%defattr(644,root,root,755)
+# R: XFree86-DPS (libdps.so)
+%{_libdir}/ImageMagick-%{iver}/modules/coders/dps.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/dps.so
+
+%if %{?_without_fpx:0}%{!?_without_fpx:1}
+%files coder-fpx
+%defattr(644,root,root,755)
+# R: fpx
+%{_libdir}/ImageMagick-%{iver}/modules/coders/fpx.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/fpx.so
+%endif
+
+%files coder-jbig
+%defattr(644,root,root,755)
+# R: jbigkit (libjbig.so)
+%{_libdir}/ImageMagick-%{iver}/modules/coders/jbig.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jbig.so
+
+%files coder-jpeg
+%defattr(644,root,root,755)
+# R: libjpeg
+%{_libdir}/ImageMagick-%{iver}/modules/coders/jpeg.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jpeg.so
+
+%if %{?_without_jasper:0}%{!?_without_jasper:1}
+%files coder-jpeg2
+%defattr(644,root,root,755)
+# R: jasper, libjpeg
+%{_libdir}/ImageMagick-%{iver}/modules/coders/jp2.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/jp2.so
+%endif
+
+%files coder-miff
+%defattr(644,root,root,755)
+# R: libjpeg, zlib, libbz2
+%{_libdir}/ImageMagick-%{iver}/modules/coders/miff.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/miff.so
+
+%files coder-mpr
+%defattr(644,root,root,755)
+# R: libxml2
+%{_libdir}/ImageMagick-%{iver}/modules/coders/mpr.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/mpr.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/msl.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/msl.so
+
+%files coder-pdf
+%defattr(644,root,root,755)
+# R: libtiff, libjpeg
+%{_libdir}/ImageMagick-%{iver}/modules/coders/pdf.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/pdf.so
+
+%files coder-png
+%defattr(644,root,root,755)
+# R: libpng
+%{_libdir}/ImageMagick-%{iver}/modules/coders/png.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/png.so
+
+%files coder-ps2
+%defattr(644,root,root,755)
+# R: libtiff, libjpeg
+%{_libdir}/ImageMagick-%{iver}/modules/coders/ps2.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps2.so
+%{_libdir}/ImageMagick-%{iver}/modules/coders/ps3.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/ps3.so
+
+%files coder-svg
+%defattr(644,root,root,755)
+# R: libxml2
+%{_libdir}/ImageMagick-%{iver}/modules/coders/svg.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/svg.so
+
+%files coder-tiff
+%defattr(644,root,root,755)
+# R: libtiff, libjpeg
+%{_libdir}/ImageMagick-%{iver}/modules/coders/tiff.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/tiff.so
+
+%files coder-url
+%defattr(644,root,root,755)
+# R: libxml2
+%{_libdir}/ImageMagick-%{iver}/modules/coders/url.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/url.so
+
+%files coder-wmf
+%defattr(644,root,root,755)
+# R: libwmf, expat, libjpeg, libpng
+%{_libdir}/ImageMagick-%{iver}/modules/coders/wmf.la
+%attr(755,root,root) %{_libdir}/ImageMagick-%{iver}/modules/coders/wmf.so
+

 %files devel
 %defattr(644,root,root,755)
 %files devel
 %defattr(644,root,root,755)

-%doc images www ImageMagick.html README.txt.gz
+#%%doc README.txt
+%doc %{_defaultdocdir}/%{name}-devel-%{version}

 
 %attr(755,root,root) %{_bindir}/Magick-config
 %attr(755,root,root) %{_libdir}/libMagick.so
 
 %attr(755,root,root) %{_bindir}/Magick-config
 %attr(755,root,root) %{_libdir}/libMagick.so

-%attr(755,root,root) %{_libdir}/libMagick.la
+%{_libdir}/libMagick.la

 %{_includedir}/magick
 
 %{_mandir}/man[45]/*
 %{_includedir}/magick
 
 %{_mandir}/man[45]/*


@@ -311,17 +878,18 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_sitearch}/auto/Image/Magick/autosplit.ix
 %{perl_sitearch}/auto/Image/Magick/Magick.bs
 %attr(755,root,root) %{perl_sitearch}/auto/Image/Magick/Magick.so
 %{perl_sitearch}/auto/Image/Magick/autosplit.ix
 %{perl_sitearch}/auto/Image/Magick/Magick.bs
 %attr(755,root,root) %{perl_sitearch}/auto/Image/Magick/Magick.so

-%{_perlmandir}/man3/Image::Magick.*
+%{_mandir}/man3/Image::Magick.*

 %{_examplesdir}/%{name}-perl
 
 %{_examplesdir}/%{name}-perl
 

+%if %{?_without_cxx:0}%{!?_without_cxx:1}

 %files c++
 %defattr(644,root,root,755)
 %files c++
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/libMagick++.so.*.*
+%attr(755,root,root) %{_libdir}/libMagick++-%{ver}.so.*.*

 
 %files c++-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick++-config
 
 %files c++-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick++-config

-%attr(755,root,root) %{_libdir}/libMagick++.la
+%{_libdir}/libMagick++.la

 %attr(755,root,root) %{_libdir}/libMagick++.so
 %{_prefix}/include/Magick++
 %{_prefix}/include/Magick++.h
 %attr(755,root,root) %{_libdir}/libMagick++.so
 %{_prefix}/include/Magick++
 %{_prefix}/include/Magick++.h


@@ -330,3 +898,4 @@ rm -rf $RPM_BUILD_ROOT
 %files c++-static
 %defattr(644,root,root,755)
 %{_libdir}/libMagick++.a
 %files c++-static
 %defattr(644,root,root,755)
 %{_libdir}/libMagick++.a

+%endif