rpms/GraphicsMagick/FC-6 GraphicsMagick.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/GraphicsMagick/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2513

Modified Files:
	GraphicsMagick.spec 
Log Message:
* Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.7-6
- *really* fix magick_config-64.h (bug #217959)



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/FC-6/GraphicsMagick.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GraphicsMagick.spec	1 Dec 2006 19:16:19 -0000	1.5
+++ GraphicsMagick.spec	1 Dec 2006 19:44:27 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
@@ -15,8 +15,13 @@
 BuildRequires: automake >= 1.7 autoconf >= 2.58 libtool >= 1.5
 BuildRequires: ghostscript-devel
 BuildRequires: libwmf-devel
-BuildRequires: libX11-devel, libXext-devel, libXt-devel
 BuildRequires: lcms-devel, libxml2-devel, librsvg2-devel
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define x_deps libX11-devel libXext-devel libXt-devel
+%else
+%define x_deps  xorg-x11-devel
+%endif
+BuildRequires: %{x_deps}
 
 %description
 GraphicsMagick is a comprehensive image processing package which is initially
@@ -28,7 +33,7 @@
 Summary: Static libraries and header files for GraphicsMagick app development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libX11-devel, libXext-devel, libXt-devel
+Requires: %{x_deps}
 Requires: ghostscript-devel
 Requires: bzip2-devel
 Requires: libtiff-devel
@@ -168,7 +173,7 @@
 #if __WORDSIZE == 32
 # include "magick_config-32.h"
 #elif __WORDSIZE == 64
-# include "magick-config-64.h"
+# include "magick_config-64.h"
 #else
 # error "unexpected value for __WORDSIZE macro"
 #endif
@@ -176,6 +181,11 @@
 #endif
 EOF
 
+%if "%{?rhel}" == "4"
+# el4/ImageMagick conflicts
+rm -f %{buildroot}%{_mandir}/man{4/miff.4,5/quantize.5}*
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -231,6 +241,9 @@
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
 
 %changelog
+* Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.7-6
+- *really* fix magick_config-64.h (bug #217959)
+
 * Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.7-5
 - fix magick-config-64.h (bug #217959)