[rpms/xfig] epel10.2: *** empty log message ***

[Hans de Goede <jwrdegoede@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/xfig
Branch : epel10.2
Commit : d74295287d76b51bfd6eac37a57294127edb248c
Author : Hans de Goede <jwrdegoede@fedoraproject.org>
Date   : 2008-07-14T08:39:05+00:00
Stats  : +31/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/xfig/c/d74295287d76b51bfd6eac37a57294127edb248c?branch=epel10.2

Log:
*** empty log message ***

---
diff --git a/xfig-3.2.5-modepanel.patch b/xfig-3.2.5-modepanel.patch
new file mode 100644
index 0000000..d178816
--- /dev/null
+++ b/xfig-3.2.5-modepanel.patch
@@ -0,0 +1,24 @@
+--- xfig.3.2.5/w_setup.c.dist	2008-07-13 23:49:46.000000000 -0400
++++ xfig.3.2.5/w_setup.c	2008-07-13 23:49:55.000000000 -0400
+@@ -23,7 +23,7 @@
+ #include "w_setup.h"
+ #include "w_util.h"
+ 
+-#define	NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */
++#define	NUM_DRAW_SW 15 /* kludge - number of switches above draw line*/
+ 
+ int		TOOL_WD, TOOL_HT;
+ int		CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT;
+@@ -94,8 +94,10 @@
+ 
+     /* space for both modepanel titles (Drawing modes and Editing modes) */
+     MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - 
+-	(MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
+-			ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
++      (MODE_SW_HT + INTERNAL_BW) * 
++      (ceil(((double)NUM_DRAW_SW+1)/SW_PER_ROW) +
++       ceil(((double)NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
++
+     if (MODEPANEL_SPACE < 2)
+ 	MODEPANEL_SPACE = 2;
+ }

diff --git a/xfig.spec b/xfig.spec
index 70beac3..597a77c 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -23,6 +23,7 @@ Patch12: xfig-3.2.5-quiet.patch
 Patch13: xfig-3.2.5-urwfonts.patch
 Patch14: xfig-3.2.5-zoom-crash.patch
 Patch15: xfig-3.2.5-missing-protos.patch
+Patch16: xfig-3.2.5-modepanel.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -97,6 +98,7 @@ Files common to both the plain Xaw and the Xaw3d version of xfig.
 %patch13 -p1 -b .urw
 %patch14 -p1 -b .zoom-crash
 %patch15 -p1
+%patch16 -p1
 ln -nfs Doc/xfig.man xfig.man
 find -type f -print0 | xargs -0 chmod -x
 rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
@@ -188,6 +190,10 @@ fi
 
 
 %changelog
+
+* Mon Jul 14 2008 Ian Hutchinson <ihutch@mit.edu> 3.2.5-11
+- Fix incorrect height of modepanel.
+
 * Thu Apr  3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-10
 - Fix missing prototype compiler warnings