SPECS (AC-branch): ImageMagick.spec - updated to 6.2.6-8 - added w...

[hawk]

Author: hawk                         Date: Wed Apr  5 08:21:49 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 6.2.6-8
- added wmf bcond

---- Files affected:
SPECS:
   ImageMagick.spec (1.222.2.1 -> 1.222.2.2) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.222.2.1 SPECS/ImageMagick.spec:1.222.2.2
--- SPECS/ImageMagick.spec:1.222.2.1	Mon Feb 20 08:56:05 2006
+++ SPECS/ImageMagick.spec	Wed Apr  5 10:21:43 2006
@@ -5,11 +5,12 @@
 %bcond_without	graphviz	# without Graphviz support
 %bcond_with	gs		# with PostScript support through ghostscript library (warning: breaks jpeg!)
 %bcond_without	jasper		# without JPEG2000 module (which uses jasper library)
+%bcond_without	wmf		# without WMF module (which uses libwmf library)
 %bcond_without	cxx		# without Magick++
 #
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.2.5
-%define		pver	5
+%define		ver 6.2.6
+%define		pver	8
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -27,12 +28,11 @@
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5:	eaee90992c8cf36f1f5fc6c887d73897
+# Source0-md5:	20728cfc1920843cc5758937f07fb562
 #Source0:	http://dl.sourceforge.net/imagemagick/%{name}-%{ver}.tar.bz2
 Patch0:		%{name}-libpath.patch
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-system-libltdl.patch
-Patch3:		%{name}-free.patch
 URL:		http://www.imagemagick.org/
 BuildRequires:	XFree86-DPS-devel
 BuildRequires:	XFree86-devel
@@ -54,7 +54,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
-BuildRequires:	libwmf-devel >= 2:0.2.2
+%{?with_wmf:BuildRequires:	libwmf-devel >= 2:0.2.2}
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -565,7 +565,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -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='  {} \;
@@ -588,6 +587,7 @@
 	--with%{!?with_gs:out}-gslib \
 	--with%{!?with_jasper:out}-jp2 \
 	--with%{!?with_cxx:out}-magick_plus_plus \
+	--with%{!?with_wmf:out}-wmf \
 	--with-gs-font-dir=%{_fontsdir}/Type1 \
 	--with-modules \
 	--with-perl=%{__perl} \
@@ -911,11 +911,13 @@
 %attr(755,root,root) %{modulesdir}/coders/url.so
 %{modulesdir}/coders/url.la
 
+%if %{with wmf}
 %files coder-wmf
 %defattr(644,root,root,755)
 # R: libwmf, expat, libjpeg, libpng
 %attr(755,root,root) %{modulesdir}/coders/wmf.so
 %{modulesdir}/coders/wmf.la
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -975,6 +977,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222.2.2  2006/04/05 08:21:43  hawk
+- updated to 6.2.6-8
+- added wmf bcond
+
 Revision 1.222.2.1  2006/02/20 07:56:05  arekm
 - up to 6.2.5.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ImageMagick.spec?r1=1.222.2.1&r2=1.222.2.2&f=u