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

[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-serv9672

Modified Files:
	xorg-x11.spec 
Log Message:
Add build_fc5 macro back, oops


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- xorg-x11.spec	31 Aug 2005 23:47:10 -0000	1.204
+++ xorg-x11.spec	1 Sep 2005 00:08:48 -0000	1.205
@@ -37,12 +37,14 @@
 %if ! %{build_autodetect_mode}
 # Set *one* of the following build targets to 1 as appropriate
 # Fedora Core development builds a.k.a. "rawhide"
+%define build_fc5		0
 %define build_fc4		1
 %define build_rhel4		0
 %define build_fc3		0
 %define build_fc2		0
 %define build_mharris		0
 %else
+%define build_fc5		0
 %define build_fc4		0
 %define build_rhel4		0
 %define build_fc3		0
@@ -587,10 +589,12 @@
 Summary: X Window System application development package
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
+
 # Experimental Requires libGL{,U}.  Once confirmed safe, we can deconditionalize
-%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
 Requires: libGL >= 1, libGLU >= 1
 %endif
+
 Obsoletes: xpm-devel, Mesa-devel
 Obsoletes: Xft-devel
 Provides: xpm-devel, Mesa-devel
@@ -698,6 +702,7 @@
 ######################################################################
 %package xdm
 Summary: X Display Manager
+Group: User Interface/X
 Requires: %{name} = %{version}, /etc/pam.d/system-auth
 # pam requires were added for bug #159332 for new audit system.  It really
 # should be a virtual provide in the pam package, to avoid odd version-release
@@ -708,10 +713,8 @@
 %if %{build_fc5}
 Requires: pam >= 0.77-10
 %endif
-
 # xinitrc requirement on 3.13 for user login shell enhancement to Xsession
 Requires: xinitrc >= 3.13
-Group: User Interface/X
 Obsoletes: XFree86-xdm
 Provides: xdm
 
@@ -989,7 +992,7 @@
 # FIXME: These should be versioned to the Mesa version
 Obsoletes: Mesa
 Provides: Mesa
-%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
 Provides: libGL = 1
 %endif
 Obsoletes: XFree86-Mesa-libGL
@@ -1011,7 +1014,7 @@
 Summary: Commonly used GL utility library
 Group: System Environment/Libraries
 Obsoletes: XFree86-Mesa-libGLU
-%if %( [ '%{build_fc5}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
 Provides: libGLU = 1
 %endif
 # Conflict is due to this package being split out from XFree86-libs a long time ago
@@ -1161,7 +1164,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}' -eq '1' -o '%{build_fc4}' -eq '1' -o '%{build_fc3}' -eq '1'] && echo 1 || echo 0 )
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
 
 %patch9500 -p0 -b .deassert-ddc-lines
 %patch9501 -p0 -b .laptop-modes.patch