rpms/xemacs/devel xemacs.spec,1.11,1.12

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs.spec 
Log Message:
Use neXtaw by default, rebuild "--with xaw3d" to get Xaw3d.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xemacs.spec	29 Jun 2005 21:57:35 -0000	1.11
+++ xemacs.spec	29 Jun 2005 22:02:32 -0000	1.12
@@ -51,8 +51,12 @@
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
 %else
+%if 0%{?_with_xaw3d:1}
 BuildRequires:  Xaw3d-devel
-%endif
+%else
+BuildRequires:  neXtaw-devel
+%endif # xaw3d
+%endif # gtk
 Requires:       xemacs-sumo >= 20050118-2
 Requires:       xemacs-common = %{version}-%{release}
 Obsoletes:      xemacs-extras
@@ -234,7 +238,7 @@
   --with-gtk \
   --with-gnome \
 %else
-  --with-athena=3d \
+  --with-athena=%{?_with_xaw3d:3d}%{!?_with_xaw3d:next} \
   --with-widgets=athena \
   --with-menubars=lucid \
   --with-scrollbars=lucid \
@@ -426,6 +430,7 @@
 - Make sure scriptlet errors won't break upgrades.
 - Add context marked dependencies for scriptlets.
 - Build with -fno-strict-aliasing per upstream recommendations.
+- Use neXtaw by default, rebuild with "--with xaw3d" to get Xaw3d.
 
 * Thu May  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
 - Avoid stack corruption in open-network-stream when built with gcc4