rpms/xfig/FC-5 xfig.3.2.4-xaw3d.patch,NONE,1.1 xfig.spec,1.34,1.35

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	xfig.spec 
Added Files:
	xfig.3.2.4-xaw3d.patch 
Log Message:

- fix #191816, Xaw3d build problem
- fix #169330, wrong docdir
- fix #194013, #187902, no parameter negotiation for xfig



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/FC-5/xfig.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xfig.spec	11 Feb 2006 06:11:23 -0000	1.34
+++ xfig.spec	7 Jun 2006 16:36:51 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 17.2
+Release: 17.3.fc5
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -19,6 +19,7 @@
 Patch5: xfig.3.2.4-buffer.patch
 Patch6: xfig.3.2.4-xpm.patch
 Patch7: xfig.3.2.4-modularX.patch
+Patch8: xfig.3.2.4-xaw3d.patch
 
 Requires: transfig >= 1:3.2.4-12
 Requires: xpdf
@@ -61,45 +62,37 @@
 %patch5 -p1 -b .buffer
 %patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
+%patch9 -p1 -b .xaw3d
 
 %build
 xmkmf
 ln -nfs Doc/xfig.man xfig.man
-make DOCDIR=%{_docdir}
+make XFIGDOCDIR=%{_docdir}/%{name}-%{version}
 
 %install
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} \
-     DOCDIR=%{_docdir} \
+     XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
      XAPPLOADDIR=%{app_defaults_dir} \
      CONFDIR=%{_datadir}/X11 \
      install install.all
 
-mkdir -p %{buildroot}/usr/share/pixmaps \
+mkdir -p %{buildroot}%{_datadir}/pixmaps \
          %{buildroot}%{_datadir}/applications
 
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
 
-rm -fr $RPM_BUILD_ROOT%{_prefix}/lib*
-
-mv $RPM_BUILD_ROOT%{_bindir}/xfig %{buildroot}%{_bindir}/xfig.bin
-cat > %{buildroot}%{_bindir}/%{name} <<EOF
-#! /bin/sh
-export XAPPLRESDIR=%{app_defaults_dir}
-export LANG=\${LANG%.UTF-8}
-exec %{_bindir}/%{name}.bin
-EOF
+rm -fr %{buildroot}%{_prefix}/lib*
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf {buildroot}
 
 %files
 %defattr(-,root,root)
-%doc %{_docdir}/%{name}
-%attr(0755,root,root) %{_bindir}/xfig
-%{_bindir}/xfig.bin
+%doc %{_docdir}/%{name}-%{version}
+%attr(0755,root,root) %{_bindir}/*
 %{_datadir}/%{name}/*
 %{_mandir}/*/*
 %{_datadir}/pixmaps/%{name}.png
@@ -107,6 +100,11 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jun 07 2006 Than Ngo <than at redhat.com> 3.2.4-17.3.fc5
+- fix #191816, Xaw3d build problem
+- fix #169330, wrong docdir
+- fix #194013, #187902, no parameter negotiation for xfig
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-17.2
 - bump again for double-long bug on ppc(64)