rpms/xorg-x11/FC-4 xorg-x11.spec,1.203,1.204

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1871

Modified Files:
	xorg-x11.spec 
Log Message:
Update spec file syntax of conditionals to satiate ancient buggy version of rpm on porkchop


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- xorg-x11.spec	31 Aug 2005 23:33:24 -0000	1.203
+++ xorg-x11.spec	31 Aug 2005 23:47:10 -0000	1.204
@@ -588,7 +588,7 @@
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 # Experimental Requires libGL{,U}.  Once confirmed safe, we can deconditionalize
-%if %{build_fc5} || %{build_fc4} || %{build_fc3}
+%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
 Requires: libGL >= 1, libGLU >= 1
 %endif
 Obsoletes: xpm-devel, Mesa-devel
@@ -989,7 +989,7 @@
 # FIXME: These should be versioned to the Mesa version
 Obsoletes: Mesa
 Provides: Mesa
-%if %{build_fc5} || %{build_fc4} || %{build_fc3}
+%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
 Provides: libGL = 1
 %endif
 Obsoletes: XFree86-Mesa-libGL
@@ -1011,7 +1011,7 @@
 Summary: Commonly used GL utility library
 Group: System Environment/Libraries
 Obsoletes: XFree86-Mesa-libGLU
-%if %{build_fc5} || %{build_fc4} || %{build_fc3}
+%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
 Provides: libGLU = 1
 %endif
 # Conflict is due to this package being split out from XFree86-libs a long time ago
@@ -1161,7 +1161,7 @@
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
 # Update: Also enabled for FC3-testing build to be released soon, which will
 #         ultimately end up in an official FC3 update eventually as well.
-%if %{build_fc5} || %{build_fc4} || %{build_fc3}
+%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
 
 %patch9500 -p0 -b .deassert-ddc-lines
 %patch9501 -p0 -b .laptop-modes.patch