SPECS: ImageMagick.spec - updated to 6.4.1-3, dropped system-libltdl.patch, ...

[hawk]

Author: hawk                         Date: Tue May 27 08:29:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 6.4.1-3, dropped system-libltdl.patch, ImageMagick now builds
  with system libltdl by default

---- Files affected:
SPECS:
   ImageMagick.spec (1.260 -> 1.261) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.260 SPECS/ImageMagick.spec:1.261
--- SPECS/ImageMagick.spec:1.260	Mon May 26 22:32:37 2008
+++ SPECS/ImageMagick.spec	Tue May 27 10:29:30 2008
@@ -11,8 +11,8 @@
 %bcond_without	exr		# without OpenEXR module
 #
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.3.6
-%define		pver	4
+%define		ver 6.4.1
+%define		pver	3
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -25,18 +25,17 @@
 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-md5:	3d1976afe522c572aa5e97cff3029649
 #Source0:	http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
 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
@@ -584,7 +583,6 @@
 %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='  {} \;
@@ -831,8 +829,8 @@
 %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
@@ -859,9 +857,9 @@
 
 %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) %{_libdir}/libMagickWand.so.*.*.*
 
 %if %{with djvu}
 %files coder-djvu
@@ -977,21 +975,21 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick-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
+%{_libdir}/libMagickCore.la
+%{_libdir}/libMagickWand.la
+%{_includedir}/ImageMagick/magick
+%{_includedir}/ImageMagick/wand
 %{_pkgconfigdir}/ImageMagick.pc
 %{_pkgconfigdir}/Wand.pc
-%{_mandir}/man1/Magick-config.1*
-%{_mandir}/man1/Wand-config.1*
+%{_mandir}/man1/MagickCore-config.1*
+%{_mandir}/man1/MagickWand-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)
@@ -1013,8 +1011,8 @@
 %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
 %{_mandir}/man1/Magick++-config.1*
 
@@ -1029,6 +1027,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.261  2008-05-27 08:29:30  hawk
+- updated to 6.4.1-3, dropped system-libltdl.patch, ImageMagick now builds
+  with system libltdl by default
+
 Revision 1.260  2008-05-26 20:32:37  hawk
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ImageMagick.spec?r1=1.260&r2=1.261&f=u