rpms/xfig/devel xfig.3.2.4-xaw3d.patch, NONE, 1.1 xfig.spec, 1.37, 1.38

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/xfig/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15978

Modified Files:
	xfig.spec 
Added Files:
	xfig.3.2.4-xaw3d.patch 
Log Message:
fix #191816, Xaw3d build problem


xfig.3.2.4-xaw3d.patch:
 SimpleMenu.c |    7 +++++++
 1 files changed, 7 insertions(+)

--- NEW FILE xfig.3.2.4-xaw3d.patch ---
--- xfig.3.2.4/SimpleMenu.c.tn	2006-05-16 17:52:48.000000000 +0200
+++ xfig.3.2.4/SimpleMenu.c	2006-05-16 17:56:46.000000000 +0200
@@ -39,10 +39,17 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 
+#ifdef XAW3D
 #include <X11/Xaw3d/XawInit.h>
 #include <X11/Xaw3d/SimpleMenP.h>
 #include <X11/Xaw3d/SmeBSB.h>
 #include <X11/Xaw3d/Cardinals.h>
+#else
+#include <X11/Xaw/XawInit.h>
+#include <X11/Xaw/SimpleMenP.h>
+#include <X11/Xaw/SmeBSB.h>
+#include <X11/Xaw/Cardinals.h>
+#endif
 
 #include <X11/Xmu/Initer.h>
 #include <X11/Xmu/CharSet.h>


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xfig.spec	5 May 2006 21:53:39 -0000	1.37
+++ xfig.spec	16 May 2006 16:12:57 -0000	1.38
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 20
+Release: 21
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -20,6 +20,7 @@
 Patch6: xfig.3.2.4-xpm.patch
 Patch7: xfig.3.2.4-modularX.patch
 Patch8: xfig-3.2.4-pdfviewer.patch
+Patch9: xfig.3.2.4-xaw3d.patch
 
 Requires: transfig >= 1:3.2.4-12
 Requires: evince
@@ -63,6 +64,7 @@
 %patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
 %patch8 -p1 -b .pdfviewer
+%patch9 -p1 -b .xaw3d
 
 %build
 xmkmf
@@ -100,6 +102,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue May 16 2006 Than Ngo <than at redhat.com> 3.2.4-21
+- fix #191816, Xaw3d build problem 
+
 * Fri May 05 2006 Than Ngo <than at redhat.com> 3.2.4-20
 - fix #169330, wrong docdir
 - fix #187902, no parameter negotiation for xfig