packages: ImageMagick/ImageMagick.spec - updated to 6.6.9-4 - some configs ...

[lisu]

Author: lisu                         Date: Fri Apr 15 11:55:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 6.6.9-4
- some configs have been moved to /etc/ImageMagick
- new coder: hdr

---- Files affected:
packages/ImageMagick:
   ImageMagick.spec (1.378 -> 1.379) 

---- Diffs:

================================================================
Index: packages/ImageMagick/ImageMagick.spec
diff -u packages/ImageMagick/ImageMagick.spec:1.378 packages/ImageMagick/ImageMagick.spec:1.379
--- packages/ImageMagick/ImageMagick.spec:1.378	Mon Feb  7 12:33:11 2011
+++ packages/ImageMagick/ImageMagick.spec	Fri Apr 15 13:55:32 2011
@@ -14,8 +14,8 @@
 %bcond_without	exr		# without OpenEXR module
 
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.6.7
-%define		pver	5
+%define		ver 6.6.9
+%define		pver	4
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de.UTF-8):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -33,7 +33,7 @@
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5:	b30b8032b2f8dd5dc003b56fbfbb92c4
+# Source0-md5:	e9355aa38daa1d2c42d7e37108bc0dfa
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
@@ -654,9 +654,10 @@
 	pkgdocdir=%{_docdir}/%{name}-doc-%{version}
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/doc/ImageMagick-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # for koffice 1.6
 cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
@@ -673,15 +674,14 @@
 %files
 %defattr(644,root,root,755)
 %dir %{_libdir}/ImageMagick-%{ver}
-%dir %{_libdir}/ImageMagick-%{ver}/config
-%{_libdir}/ImageMagick-%{ver}/config/*.xml
 %dir %{modulesdir}
 %dir %{modulesdir}/coders
 %dir %{modulesdir}/filters
 %dir %{_datadir}/ImageMagick-%{ver}
-%dir %{_datadir}/ImageMagick-%{ver}/config
-%{_datadir}/ImageMagick-%{ver}/config/*.xml
-%{_datadir}/ImageMagick-%{ver}/config/sRGB.icm
+%{_datadir}/ImageMagick-%{ver}/*.xml
+%dir %{_sysconfdir}/ImageMagick
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{_sysconfdir}/ImageMagick/*.xml
+%{_sysconfdir}/ImageMagick/sRGB.icm
 
 # ========= coders without additional deps
 %attr(755,root,root) %{modulesdir}/coders/aai.so
@@ -736,6 +736,8 @@
 %{modulesdir}/coders/gray.la
 %attr(755,root,root) %{modulesdir}/coders/hald.so
 %{modulesdir}/coders/hald.la
+%attr(755,root,root) %{modulesdir}/coders/hdr.so
+%{modulesdir}/coders/hdr.la
 %attr(755,root,root) %{modulesdir}/coders/histogram.so
 %{modulesdir}/coders/histogram.la
 %attr(755,root,root) %{modulesdir}/coders/hrz.so
@@ -1032,8 +1034,6 @@
 %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
@@ -1069,7 +1069,6 @@
 %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}/ImageMagick/Magick++
 %{_includedir}/ImageMagick/Magick++.h
@@ -1088,6 +1087,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.379  2011/04/15 11:55:32  lisu
+- updated to 6.6.9-4
+- some configs have been moved to /etc/ImageMagick
+- new coder: hdr
+
 Revision 1.378  2011/02/07 11:33:11  lisu
 - up to 6.6.7-5
 - new coders: aai and mac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ImageMagick/ImageMagick.spec?r1=1.378&r2=1.379&f=u