X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ImageMagick.spec;h=d8400eef9cb59a82432ced4ef78a59efc8f12012;hb=e3adf33fb0af6c88d0b4c39eda845d11848788c9;hp=d4b2f3c69f77dee4445f1a2ae679b81a9bd55b06;hpb=6614fffa97f5800e92507a51ae0e9283dbc4f1a5;p=packages%2FImageMagick.git

diff --git a/ImageMagick.spec b/ImageMagick.spec
index d4b2f3c..d8400ee 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -4,11 +4,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.1
-%define		pver	2
+%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
@@ -26,24 +27,21 @@ Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
-# Source0-md5:	b7cf4e8b0b3118c65379d434124d5065
+# 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}-free.patch
-Patch4:		%{name}-dot.patch
+Patch3:		%{name}-link.patch
 URL:		http://www.imagemagick.org/
-BuildRequires:	X11-DPS-devel
-BuildRequires:	X11-devel
-BuildRequires:	autoconf >= 2.59
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	expat-devel >= 1.95.7
 BuildRequires:	freetype-devel >= 2.0.2-2
 BuildRequires:	gd-devel >= 2.0.15
 %{?with_gs:BuildRequires:	ghostscript-devel}
-%{?with_graphviz:BuildRequires:	graphviz-devel >= 1.12}
+%{?with_graphviz:BuildRequires:	graphviz-devel >= 2.6}
 %{?with_jasper:BuildRequires:	jasper-devel >= 1.700.5}
 BuildRequires:	jbigkit-devel
 BuildRequires:	lcms-devel
@@ -54,18 +52,21 @@ BuildRequires:	libpng-devel >= 1.0.8
 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
+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		rpmldflags	%{nil}
+%define		filterout_ld	(-Wl,)?-s (-Wl,)?--strip-all
 %define		modulesdir	%{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
 
 %description
@@ -76,8 +77,8 @@ well.
 
 %description -l de
 ImageMagick ist ein Tool zur Bildanzeige, -konvertierung und
-manipulation, -das unter X-Window läuft. Es ist enorm leitungsfähig
-in Bezug auf die Grafikmanipulationsfunktionen, die es dem Anwender
+manipulation, -das unter X-Window läuft. Es ist enorm leitungsfähig in
+Bezug auf die Grafikmanipulationsfunktionen, die es dem Anwender
 bietet, und auf die Vielfalt der unterstützten Formate.
 
 %description -l es
@@ -156,13 +157,13 @@ Summary(ru):	
 Summary(uk):	èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú ImageMagick
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	X11-devel
 Requires:	bzip2-devel
 Requires:	freetype-devel
 Requires:	lcms-devel
-Requires:	libltdl-devel
 Requires:	libjpeg-devel
+Requires:	libltdl-devel
 Requires:	libtiff-devel
+Requires:	xorg-lib-libXext-devel
 Requires:	zlib-devel
 
 %description devel
@@ -387,20 +388,6 @@ 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)
@@ -566,7 +553,6 @@ Modu
 %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='  {} \;
@@ -584,11 +570,13 @@ 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 \
 	--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} \
@@ -677,6 +665,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/html.la
 %attr(755,root,root) %{modulesdir}/coders/icon.so
 %{modulesdir}/coders/icon.la
+%attr(755,root,root) %{modulesdir}/coders/info.so
+%{modulesdir}/coders/info.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/magick.so
@@ -824,12 +814,6 @@ 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: X11-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)
@@ -910,11 +894,13 @@ rm -rf $RPM_BUILD_ROOT
 %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)
@@ -929,7 +915,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wand
 %{_pkgconfigdir}/ImageMagick.pc
 %{_pkgconfigdir}/Wand.pc
-%{_mandir}/man[45]/*
 %{_mandir}/man1/Magick-config.1*
 %{_mandir}/man1/Wand-config.1*