- 5.3.9, updated amfix patch

Changed files:
    ImageMagick-amfix.patch -> 1.2
    ImageMagick.spec -> 1.95

diff --git a/ImageMagick-amfix.patch b/ImageMagick-amfix.patch
index a87234ce9ebc242607898119c72a44b4d3ef2665..1bb7843758e1fe2383d248267bcf68ddaac6b1d6 100644 (file)
--- a/ImageMagick-amfix.patch
+++ b/ImageMagick-amfix.patch
@@ -33,25 +33,3 @@
  
  # Subdirectories to build
  if WITH_MAGICK_PLUS_PLUS
---- ImageMagick-5.3.7/utilities/Makefile.am.orig       Wed Jul 25 22:58:53 2001
-+++ ImageMagick-5.3.7/utilities/Makefile.am    Sun Aug  5 13:18:35 2001
-@@ -50,7 +50,7 @@
- X11PROGRAMS =
- MANPAGES = $(STDMANPAGES)
- endif
--bin_PROGRAMS = composite convert identify iptcutil mogrify montage $(X11PROGRAMS)
-+bin_PROGRAMS = composite convert identify mogrify montage $(X11PROGRAMS)
- 
- # Libtool libraries, dependencies, and linker flags used by most executables
- if WITH_MODULES
-@@ -85,10 +85,6 @@
- import_LDFLAGS    = $(COMMONLDFLAGS)
- import_SOURCES    = import.c
- 
--iptcutil_LDADD    = # Don't use ImageMagick LIBS
--iptcutil_LDFLAGS  = # Don't use ImageMagick LDFLAGS
--iptcutil_SOURCES  = iptcutil.c
--
- mogrify_LDADD     = $(COMMONLDADD)
- mogrify_LDFLAGS   = $(COMMONLDFLAGS)
- mogrify_SOURCES   = mogrify.c

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f903338715ac0b35c72920df429bb4eb1e759c7b..05586eb8904726cc5117ebc1b30433d8ceb67bcd 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -5,13 +5,14 @@ Summary(fr):  Visualisation, conversion, et manipulation d'images sous X
 Summary(pl):   Narzêdzie do wy¶wietlania, konwersji i manipulacji grafikami
 Summary(tr):   X altýnda resim gösterme, çevirme ve deðiþiklik yapma
 Name:          ImageMagick
-Version:       5.3.7
+Version:       5.3.9
 Release:       1
 Epoch:         1
 License:       Freeware
 Group:         X11/Applications/Graphics
 Group(de):     X11/Applikationen/Grafik
 Group(pl):     X11/Aplikacje/Grafika
+Group(pt):     X11/Aplicações/Gráficos
 Source0:       ftp://ftp.simplesystems.org/pub/ImageMagick/%{name}-%{version}.tar.gz
 Patch0:                %{name}-libpath.patch
 Patch1:                %{name}-perlpaths.patch
@@ -36,6 +37,7 @@ BuildRequires:        libxml2-devel >= 2.0
 #BuildRequires:        fpx-devel
 #BuildRequires:        hdf-devel
 #BuildRequires:        jbigkit-devel
+#BuildRequires:        jasper-devel
 BuildRequires: autoconf
 BuildRequires: automake >= 1.4d
 Requires:      %{name}-libs = %{version}
@@ -82,7 +84,12 @@ Summary:     Libraries and header files for ImageMagick development
 Summary(pl):   Biblioteki i pliki nag³ówkowe dla ImageMagick
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
+Group(es):     X11/Desarrollo/Bibliotecas
+Group(fr):     X11/Development/Librairies
 Group(pl):     X11/Programowanie/Biblioteki
+Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
+Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description devel
@@ -115,18 +122,23 @@ Summary:  ImageMagick static libraries
 Summary(pl):   Biblioteki statyczne ImageMagick
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
+Group(es):     X11/Desarrollo/Bibliotecas
+Group(fr):     X11/Development/Librairies
 Group(pl):     X11/Programowanie/Biblioteki
+Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
+Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
 ImageMagick static libraries.
 
-%description -l pl devel
+%description -l pl static
 Biblioteki statyczne ImageMagick.
 
 %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
 Group:         Development/Languages/Perl
 Group(de):     Entwicklung/Sprachen/Perl
 Group(pl):     Programowanie/Jêzyki/Perl
@@ -149,6 +161,9 @@ Group(de):  X11/Libraries
 Group(es):     X11/Bibliotecas
 Group(fr):     X11/Librairies
 Group(pl):     X11/Biblioteki
+Group(pt_BR):  X11/Bibliotecas
+Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 
 %description libs
 ImageMagick libraries.
@@ -164,6 +179,9 @@ Group(de):  X11/Libraries
 Group(es):     X11/Bibliotecas
 Group(fr):     X11/Librairies
 Group(pl):     X11/Biblioteki
+Group(pt_BR):  X11/Bibliotecas
+Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-libs = %{version}
 
 %description c++
@@ -183,7 +201,12 @@ Summary:   C++ bindings for the ImageMagick library
 Summary(pl):   Pliki nag³ówkowe z interfejsem C++ do ImageMagick
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
+Group(es):     X11/Desarrollo/Bibliotecas
+Group(fr):     X11/Development/Librairies
 Group(pl):     X11/Programowanie/Biblioteki
+Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
+Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-c++ = %{version}
 Requires:      %{name}-devel = %{version}
 
@@ -207,7 +230,12 @@ Summary:   C++ bindings for the ImageMagick - static library
 Summary(pl):   Interfejs C++ do ImageMagick - biblioteka statyczna
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
+Group(es):     X11/Desarrollo/Bibliotecas
+Group(fr):     X11/Development/Librairies
 Group(pl):     X11/Programowanie/Biblioteki
+Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
+Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-c++-devel = %{version}
 Requires:      %{name}-devel = %{version}
 
@@ -257,15 +285,15 @@ install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 
 gzip -9nf README.txt
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post   libs -p /sbin/ldconfig
 %postun libs -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)
 %attr(755,root,root) %{_libdir}/libMagick.so.*.*