SPECS: ImageMagick.spec - fixed -devel deps; dps coder requires li...

qboosh qboosh at pld-linux.org
Sun Feb 19 19:48:25 CET 2006


Author: qboosh                       Date: Sun Feb 19 18:48:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed -devel deps; dps coder requires libdps not present in X11R7

---- Files affected:
SPECS:
   ImageMagick.spec (1.227 -> 1.228) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.227 SPECS/ImageMagick.spec:1.228
--- SPECS/ImageMagick.spec:1.227	Wed Feb 15 01:06:44 2006
+++ SPECS/ImageMagick.spec	Sun Feb 19 19:48:19 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_with	dps		# build DPS coder (uses libdps removed from X11R7)
 %bcond_without	fpx		# without FlashPIX module (which uses fpx library)
 %bcond_without	graphviz	# without Graphviz support
 %bcond_with	gs		# with PostScript support through ghostscript library (warning: breaks jpeg!)
@@ -33,6 +34,7 @@
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-system-libltdl.patch
 URL:		http://www.imagemagick.org/
+%{?with_dps:BuildRequires:	XFree86-DPS-devel}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	bzip2-devel >= 1.0.1
@@ -162,9 +164,9 @@
 Requires:	libjpeg-devel
 Requires:	libltdl-devel
 Requires:	libtiff-devel
-BuildRequires:	xorg-lib-libSM-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXt-devel
+Requires:	xorg-lib-libSM-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXt-devel
 Requires:	zlib-devel
 
 %description devel
@@ -826,11 +828,13 @@
 %attr(755,root,root) %{modulesdir}/coders/dot.so
 %{modulesdir}/coders/dot.la
 
+%if %{with dps}
 %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
+%endif
 
 %if %{with fpx}
 %files coder-fpx
@@ -976,6 +980,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228  2006/02/19 18:48:19  qboosh
+- fixed -devel deps; dps coder requires libdps not present in X11R7
+
 Revision 1.227  2006/02/15 00:06:44  wolf
 - rel 2
 
================================================================

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



More information about the pld-cvs-commit mailing list