From bc7c9684fe1456f80775541aad1e2cb27319b23b Mon Sep 17 00:00:00 2001
From: cvs2git <feedback@pld-linux.org>
Date: Mon, 21 Aug 2006 09:08:03 +0000
Subject: [PATCH] This commit was manufactured by cvs2git to create tag
 'auto-ac-ImageMagick- 6_2_9_1-1'.

Sprout from master 2006-08-21 09:01:03 UTC havner <havner@pld-linux.org> '- update for 6.2.9'
Cherrypick from AC-branch 2006-08-21 09:08:03 UTC havner <havner@pld-linux.org> '- 6.2.9-1 (http://securitytracker.com/id?1016699)':
    ImageMagick.spec -> 1.222.2.3
---
 ImageMagick.spec | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 17135f0..2f38ce5 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -8,8 +8,8 @@
 %bcond_without	cxx		# without Magick++
 #
 %include	/usr/lib/rpm/macros.perl
-%define		ver 6.2.6
-%define		pver	8
+%define		ver 6.2.9
+%define		pver	1
 %define		QuantumDepth	16
 Summary:	Image display, conversion, and manipulation under X
 Summary(de):	Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -22,19 +22,21 @@ Summary(tr):	X alt
 Summary(uk):	ðÅÒÅÇÌÑÄ, ËÏÎ×ÅÒÔÕ×ÁÎÎÑ ÔÁ ÏÂÒÏÂËÁ ÚÏÂÒÁÖÅÎØ Ð¦Ä 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:	20728cfc1920843cc5758937f07fb562
+# Source0-md5:	44cdd1e43b91c0def38edf4a0b8a01ed
 #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}-link.patch
 URL:		http://www.imagemagick.org/
-BuildRequires:	autoconf >= 2.59-9
+BuildRequires:	XFree86-DPS-devel
+BuildRequires:	XFree86-devel
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	expat-devel >= 1.95.7
@@ -56,17 +58,14 @@ BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	rpmbuild(macros) >= 1.315
 # only checked for, but only supplied scripts/txt2html is used
 #BuildRequires:	txt2html
-BuildRequires:	xorg-lib-libXext
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	ImageMagick-coder-dps
 Obsoletes:	ImageMagick-coder-mpeg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # we don't want "-s" here, because it would be added to `Magick*-config --ldflags`
-%define		filterout_ld	(-Wl,)?-s (-Wl,)?--strip-all
+%define		rpmldflags	%{nil}
 %define		modulesdir	%{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
 
 %description
@@ -157,13 +156,13 @@ Summary(ru):	
 Summary(uk):	èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	XFree86-devel
 Requires:	bzip2-devel
 Requires:	freetype-devel
 Requires:	lcms-devel
 Requires:	libjpeg-devel
 Requires:	libltdl-devel
 Requires:	libtiff-devel
-Requires:	xorg-lib-libXext-devel
 Requires:	zlib-devel
 
 %description devel
@@ -388,6 +387,20 @@ Coder module for GraphViz DOT files.
 %description coder-dot -l pl
 Modu³ kodera dla plików GraphViz DOT.
 
+%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} = %{epoch}:%{version}-%{release}
+
+%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)
@@ -570,7 +583,6 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html
 	--enable-lzw \
 	--enable-shared \
 	--disable-ltdl-install \
-	--without-dps \
 	--with%{!?with_graphviz:out}-dot \
 	--with%{!?with_fpx:out}-fpx \
 	--with%{!?with_gs:out}-gslib \
@@ -814,6 +826,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{modulesdir}/coders/dot.so
 %{modulesdir}/coders/dot.la
 
+%files coder-dps
+%defattr(644,root,root,755)
+# R: XFree86-DPS (libdps.so)
+%attr(755,root,root) %{modulesdir}/coders/dps.so
+%{modulesdir}/coders/dps.la
+
 %if %{with fpx}
 %files coder-fpx
 %defattr(644,root,root,755)
-- 
2.44.0