rpms/GraphicsMagick/devel GraphicsMagick.spec,1.7,1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/GraphicsMagick/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2590

Modified Files:
	GraphicsMagick.spec 
Log Message:
make buildable on rhel4 too



Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GraphicsMagick.spec	1 Dec 2006 19:36:01 -0000	1.7
+++ GraphicsMagick.spec	1 Dec 2006 19:46:02 -0000	1.8
@@ -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
@@ -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}
@@ -233,6 +243,7 @@
 %changelog
 * Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.7-6
 - *really* fix magick_config-64.h (bug #217959)
+- make buildable on rhel4 too.
 
 * Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.7-5
 - fix magick-config-64.h (bug #217959)