rpms/bzflag/FC-5 bzflag.spec,1.23,1.24

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/rpms/bzflag/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7209

Modified Files:
	bzflag.spec 
Log Message:
automatically decide between modular/traditional X depending on %fedora



Index: bzflag.spec
===================================================================
RCS file: /cvs/extras/rpms/bzflag/FC-5/bzflag.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bzflag.spec	11 May 2006 17:35:27 -0000	1.23
+++ bzflag.spec	12 May 2006 08:26:51 -0000	1.24
@@ -1,5 +1,17 @@
-# Use --without modular_X to rebuild without modular X deps
+# Use --with/--without modular_X to rebuild with/without modular X deps
+
+%if 0%{?fedora}
+%if 0%{?fedora} < 5
+# default to non-modular X on FC < 5
+%define _modular_X 0%{?_with_modular_x:1}
+%else
+# default to modular X on FC >= 5
 %define _modular_X 0%{!?_without_modular_x:1}
+%endif
+%else
+# default to modular X elsewhere
+%define _modular_X 0%{!?_without_modular_x:1}
+%endif
 
 %define desktop_vendor fedora
 #define date           20050930
@@ -87,7 +99,10 @@
 %{_mandir}/man*/*
 
 %changelog
-* Thu May 11 2006 Nils Philippsen <nphilipp at redhat.com> 2.0.6-1%{?dist}
+* Fri May 12 2006 Nils Philippsen <nphilipp at redhat.com> 2.0.6-1%{?dist}
+- automatically decide between modular/traditional X depending on %%fedora
+
+* Thu May 11 2006 Nils Philippsen <nphilipp at redhat.com>
 - version 2.0.6
 - add disttag
 - remove upstreamed stringdos patch