[rpms/xfig] epel10: - New upstream 3.2.5b release

[rpms/xfig] epel10: - New upstream 3.2.5b release

[Hans de Goede]

            A new commit has been pushed.

            Repo   : rpms/xfig
            Branch : epel10
            Commit : 77c0c5fad2853289c06de89c34e5cc68540b6bab
            Author : Hans de Goede <jwrdegoede@fedoraproject.org>
            Date   : 2009-09-30T21:30:33+00:00
            Stats  : +11/-643 in 11 file(s)
            URL    : https://src.fedoraproject.org/rpms/xfig/c/77c0c5fad2853289c06de89c34e5cc68540b6bab?branch=epel10

            Log:
            - New upstream 3.2.5b release
- Drop many merged patches

---
diff --git a/.cvsignore b/.cvsignore
index e6daea9..b652b45 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xfig.3.2.5a.tar.gz
+xfig.3.2.5b.full.tar.gz

diff --git a/sources b/sources
index 19dd5bd..9b95348 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20e8774f9cbaaf314ddf515110641a52  xfig.3.2.5a.tar.gz
+499b0ce103a6b353453bf7e327f9a3b9  xfig.3.2.5b.full.tar.gz

diff --git a/xfig-3.2.4-redhat.patch b/xfig-3.2.4-redhat.patch
deleted file mode 100644
index 8b6d62c..0000000
--- a/xfig-3.2.4-redhat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- xfig.3.2.4/Fig.ad.redhat	2002-12-19 01:05:41.000000000 +0100
-+++ xfig.3.2.4/Fig.ad	2003-05-06 11:45:15.000000000 +0200
-@@ -11,7 +11,7 @@
- Fig*AllowShellResize: false
- 
- ! Image editor - can edit imported image
--Fig.image_editor:		xv
-+Fig.image_editor:		xdg-open
- 
- ! name of ghostscript (not ghostview)
- Fig.ghostscript:		gs
-@@ -20,16 +20,16 @@
- ! 		This is for viewing the xfig html reference.
- ! For netscape, this command will open the help pages in a running netscape,
- !     or start a new netscape if one isn't already running
--Fig.browser:	netscape -remote 'openFile(%f)' || netscape %f
-+Fig.browser:	xdg-open %f
- 
- ! pdfviewer - put your favorite pdf viewer here.  
- !		This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer:			acroread %f
-+Fig.pdfviewer:			xdg-open %f
- 
- ! Spell check program - put your favorite spelling check program here.
- !		It must write the misspelled words to standard output.
- 
--Fig.spellcheckcommand:	spell %f
-+Fig.spellcheckcommand:	enchant -l %f
- 
- ! delay before spinner automatically counts when pressed (milliseconds)
- Fig.spinner_delay:		1000

diff --git a/xfig-3.2.5-color-resources.patch b/xfig-3.2.5-color-resources.patch
deleted file mode 100644
index b7bef5d..0000000
--- a/xfig-3.2.5-color-resources.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up xfig.3.2.5/Fig-color.ad~ xfig.3.2.5/Fig-color.ad
---- xfig.3.2.5/Fig.ad~	2007-11-16 13:47:45.000000000 +0100
-+++ xfig.3.2.5/Fig.ad	2007-11-16 13:47:52.000000000 +0100
-@@ -113,19 +113,19 @@
- ! I include both for compatibility.  Be sure to change both values when
- ! modifying them.
- 
--	Fig*horizontal.shadowWidth: 0
--	Fig*horizontal.topShadowPixel: black
--	Fig*horizontal.bottomShadowPixel: white
--	Fig*horizontal.topShadow: black
--	Fig*horizontal.bottomShadow: white
-+!	Fig*horizontal.shadowWidth: 0
-+!	Fig*horizontal.topShadowPixel: black
-+!	Fig*horizontal.bottomShadowPixel: white
-+!	Fig*horizontal.topShadow: black
-+!	Fig*horizontal.bottomShadow: white
- 
- ! the following is done so the widget set doesn't try to make shades of
- ! the scrollbar shadows (even though the width is 0 it takes more colors)
--	Fig*Scrollbar.shadowWidth: 0
--	Fig*Scrollbar.topShadow: black
--	Fig*Scrollbar.bottomShadow: white
--	Fig*Scrollbar.topShadowPixel: black
--	Fig*Scrollbar.bottomShadowPixel: white
-+!	Fig*Scrollbar.shadowWidth: 0
-+!	Fig*Scrollbar.topShadow: black
-+!	Fig*Scrollbar.bottomShadow: white
-+!	Fig*Scrollbar.topShadowPixel: black
-+!	Fig*Scrollbar.bottomShadowPixel: white
- 
- ! this is for the standard color buttons in the color panel
- 	Fig*stdColor.shadowWidth: 2
-@@ -655,7 +655,7 @@
- 
- Fig*FigList*background: 		gray95
- Fig*List*background: 			gray95
--Fig*Scrollbar.background: 		gray95
-+Fig*Scrollbar.background: 		gray80
- 
- Fig*Label.background: 			gray80
- Fig*ind_box.background:			gray80
-@@ -666,8 +666,8 @@
- Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth:	2
- 
- !##### Shadows
--Fig*shadowWidth:			1
--Fig*Label.shadowWidth:			1
-+!Fig*shadowWidth:			1
-+!Fig*Label.shadowWidth:			1
- Fig*horizontal.shadowWidth: 		2
- Fig*Scrollbar.shadowWidth:		2
- ! no shadows for update indicators

diff --git a/xfig-3.2.5-missing-protos.patch b/xfig-3.2.5-missing-protos.patch
deleted file mode 100644
index d9ec28f..0000000
--- a/xfig-3.2.5-missing-protos.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urNad xfig~/e_chop.c xfig/e_chop.c
---- xfig~/e_chop.c
-+++ xfig/e_chop.c
-@@ -22,6 +22,7 @@
- #ifndef __FreeBSD__
- #include <alloca.h>
- #endif
-+#include <math.h>
- #include "fig.h"
- #include "resources.h"
- #include "mode.h"
-@@ -31,6 +32,9 @@
- #include "u_list.h"
- #include "u_search.h"
- #include "u_undo.h"
-+#include "u_markers.h"
-+#include "u_geom.h"
-+#include "u_redraw.h"
- #include "w_canvas.h"
- #include "w_drawprim.h"
- #include "w_mousefun.h"
-@@ -39,6 +43,8 @@
- #include "w_zoom.h"
- #include "w_snap.h"
- #include "w_intersect.h"
-+#include "w_cursor.h"
-+#include "f_util.h"
- 
- static void select_axe_object();
- static void select_log_object();
-diff -urNad xfig~/main.c xfig/main.c
---- xfig~/main.c
-+++ xfig/main.c
-@@ -68,6 +68,8 @@
- #include <X11/keysym.h>
- #endif  /* I18N */
- 
-+#include <X11/IntrinsicP.h>
-+
- /* EXPORTS */
- 
- Boolean	    geomspec;
-diff -urNad xfig~/w_intersect.c xfig/w_intersect.c
---- xfig~/w_intersect.c
-+++ xfig/w_intersect.c
-@@ -23,6 +23,8 @@
- #include "mode.h"
- #include "w_snap.h"
- #include "w_intersect.h"
-+#include "w_msgpanel.h"
-+#include "f_util.h"
- #include "u_quartic.h"
- #include <alloca.h>
- #include <math.h>
-diff -urNad xfig~/w_intersect.h xfig/w_intersect.h
---- xfig~/w_intersect.h
-+++ xfig/w_intersect.h
-@@ -59,4 +59,6 @@
- 
- extern F_line * build_text_bounding_box(F_text * t);
- 
-+extern void delete_text_bounding_box(F_line * l);
-+
- #endif
-diff -urNad xfig~/w_snap.c xfig/w_snap.c
---- xfig~/w_snap.c
-+++ xfig/w_snap.c
-@@ -27,7 +27,10 @@
- #include "w_setup.h"
- #include "w_indpanel.h"
- #include "w_util.h"
-+#include "w_msgpanel.h"
- #include "u_quartic.h"
-+#include "u_search.h"
-+#include "f_util.h"
- #include <math.h>
- #ifndef __FreeBSD__
- #include <alloca.h>
-diff -up xfig.3.2.5a/w_canvas.h~ xfig.3.2.5a/w_canvas.h
---- xfig.3.2.5a/w_canvas.h~	2008-06-19 21:55:20.000000000 +0200
-+++ xfig.3.2.5a/w_canvas.h	2009-03-27 16:42:25.000000000 +0100
-@@ -35,7 +35,7 @@ extern void	toggle_show_balloons(void);
- extern void	toggle_show_lengths(void);
- extern void	toggle_show_vertexnums(void);
- extern void	toggle_show_borders(void);
--extern void 	round_coords();				// isometric grid
-+extern void 	round_coords(int *x, int *y);		// isometric grid
- 
- extern void		canvas_selected(Widget tool, XButtonEvent *event, String *params, Cardinal *nparams);
- extern void	paste_primary_selection(void);

diff --git a/xfig-3.2.5-mkstemp.diff b/xfig-3.2.5-mkstemp.diff
deleted file mode 100644
index 2d14981..0000000
--- a/xfig-3.2.5-mkstemp.diff
+++ /dev/null
@@ -1,321 +0,0 @@
-diff -urNad xfig~/f_readeps.c xfig/f_readeps.c
---- xfig~/f_readeps.c
-+++ xfig/f_readeps.c
-@@ -250,11 +250,10 @@
-     int         urx, llx, ury, lly;
-     int         pdf_flag;
- {
--    static	tempseq = 0;
-     char        buf[300];
-     FILE       *tmpfp, *pixfile, *gsfile;
-     char       *psnam, *driver;
--    int         status, wid, ht, nbitmap;
-+    int         status, wid, ht, nbitmap, fd;
-     char        tmpfile[PATH_MAX],
- 		pixnam[PATH_MAX],
- 		errnam[PATH_MAX],
-@@ -270,8 +269,12 @@
- 	/* re-open the pipe */
- 	close_picfile(file, filetype);
- 	file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
--	sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
--	if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
-+   snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
-+   if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
-+       if (fd != -1) {
-+         unlink(tmpfile);
-+         close(fd);
-+       }
- 	    file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
- 	    return False;
- 	}
-@@ -280,10 +283,20 @@
- 	fclose(tmpfp);
-     }
-     /* make name /TMPDIR/xfig-pic######.pix */
--    sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
-+    snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(pixnam)) == -1) {
-+        file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
-+        return False;
-+    }
-+    close(fd);
-+
-     /* and file name for any error messages from gs */
--    sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
--    tempseq++;
-+    snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(errnam)) == -1) {
-+       file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
-+       return False;
-+    }
-+    close(fd);
- 
-     /* generate gs command line */
-     /* for monochrome, use pbm */
-diff -urNad xfig~/f_readgif.c xfig/f_readgif.c
---- xfig~/f_readgif.c
-+++ xfig/f_readgif.c
-@@ -76,7 +76,7 @@
- 	char		buf[BUFLEN],pcxname[PATH_MAX];
- 	FILE		*giftopcx;
- 	struct Cmap 	localColorMap[MAX_COLORMAP_SIZE];
--	int		i, stat, size;
-+	int		i, stat, size, fd;
- 	int		useGlobalColormap;
- 	unsigned int	bitPixel, red, green, blue;
- 	unsigned char	c;
-@@ -173,7 +173,13 @@
- 	/* now call giftopnm and ppmtopcx */
- 
- 	/* make name for temp output file */
--	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pcxname)) == -1) {
-+		file_msg("Cannot create temporary file\n");
-+		return FileInvalid;
-+	}
-+	close(fd);
-+
- 	/* make command to convert gif to pcx into temp file */
- 	sprintf(buf, "giftopnm -quiet | ppmtopcx -quiet > %s", pcxname);
- 	if ((giftopcx = popen(buf,"w" )) == 0) {
-diff -urNad xfig~/f_readppm.c xfig/f_readppm.c
---- xfig~/f_readppm.c
-+++ xfig/f_readppm.c
-@@ -34,10 +34,16 @@
- {
- 	char	 buf[BUFLEN],pcxname[PATH_MAX];
- 	FILE	*giftopcx;
--	int	 stat, size;
-+	int	 stat, size, fd;
- 
- 	/* make name for temp output file */
--	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pcxname)) == -1) {
-+	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
-+	    return FileInvalid;
-+	}
-+	close(fd);
-+
- 	/* make command to convert gif to pcx into temp file */
- 	sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
- 	if ((giftopcx = popen(buf,"w" )) == 0) {
-diff -urNad xfig~/f_readtif.c xfig/f_readtif.c
---- xfig~/f_readtif.c
-+++ xfig/f_readtif.c
-@@ -33,11 +33,16 @@
- {
- 	char	 buf[2*PATH_MAX+40],pcxname[PATH_MAX];
- 	FILE	*tiftopcx;
--	int	 stat;
-+	int	 stat, fd;
- 
- 	/* make name for temp output file */
--	sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
--
-+	snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+	if ((fd = mkstemp(pcxname)) == -1) {
-+	    file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
-+		return FileInvalid;
-+	}
-+	close(fd);
-+	
- 	/* make command to convert tif to pnm then to pcx into temp file */
- 	/* for some reason, tifftopnm requires a file and can't work in a pipe */
- 	sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
-diff -urNad xfig~/f_util.c xfig/f_util.c
---- xfig~/f_util.c
-+++ xfig/f_util.c
-@@ -906,14 +906,20 @@
- int strain_out(char *name)
- {
-     char    line[RC_BUFSIZ+1], *tok;
-+    int fd;
- 
-     /* make a temp filename in the user's home directory so we
-        can just rename it to .xfigrc after creating it */
--    sprintf(tmpname, "%s/%s%06d", userhome, "xfig-xfigrc", getpid());
--    tmpf = fopen(tmpname,"wb");
--    if (tmpf == 0) {
--	file_msg("Can't make temporary file for .xfigrc - error: %s",strerror(errno));
--	return -1;	
-+    snprintf(tmpname, sizeof(tmpname), "%s/xfig-xfigrc.XXXXXX", userhome);
-+
-+    if ((fd = mkstemp(tmpname)) == -1 || (tmpf = fdopen(fd, "wb")) == NULL) {
-+       file_msg("Can't make temporary file for .xfigrc - error: %s",
-+              strerror(errno));
-+       if (fd != -1) {
-+          unlink(tmpname);
-+          close(fd);
-+       }
-+       return -1;
-     }
-     /* read the .xfigrc file and write all to temp file except file names */
-     xfigrc = fopen(xfigrc_name,"r");
-diff -urNad xfig~/main.c xfig/main.c
---- xfig~/main.c
-+++ xfig/main.c
-@@ -657,8 +657,10 @@
-     update_figs = False;
- 
-     /* get the TMPDIR environment variable for temporary files */
--    if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL)
--	TMPDIR = "/tmp";
-+    if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL) {
-+		if ((TMPDIR = getenv("TMPDIR")) == NULL)
-+			TMPDIR = "/tmp";
-+	}
- 
-     /* first check args to see if user wants to scale the figure as it is
- 	read in and make sure it is a resonable (positive) number */
-@@ -1673,7 +1675,14 @@
-     if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
- 	strcat(cut_buf_name, "/.xfig");
-     } else {
--	sprintf(cut_buf_name, "%s/xfig%06d", TMPDIR, getpid());
-+		int fd;
-+		sprintf(cut_buf_name, "%s/xfig.XXXXXX", TMPDIR);
-+		if ((fd = mkstemp(cut_buf_name)) == -1) {
-+			fprintf(stderr, "Can't create temporary file for cut_buff: %s\n",
-+					strerror(errno));
-+			exit(0);
-+		}
-+		close(fd);
-     }
- }
- 
-diff -urNad xfig~/mode.c xfig/mode.c
---- xfig~/mode.c
-+++ xfig/mode.c
-@@ -86,7 +86,7 @@
- 
- int		cur_exp_lang;		/* gets initialized in main.c */
- Boolean		batch_exists = False;
--char		batch_file[32];
-+char		batch_file[PATH_MAX];
- 
- /*******************************************************************/
- /* If you change the order of the lang_items[] you must change the */
-diff -urNad xfig~/u_print.c xfig/u_print.c
---- xfig~/u_print.c
-+++ xfig/u_print.c
-@@ -92,9 +92,16 @@
-     char	    syspr[2*PATH_MAX+200];
-     char	    tmpfile[PATH_MAX];
-     char	   *name;
-+    int     fd;
- 
--    sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
-+    snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
-     warnexist = False;
-+    if ((fd = mkstemp(tmpfile)) == -1) {
-+       file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
-+       return;
-+    }
-+    close(fd);
-+
-     init_write_tmpfile();
-     if (write_file(tmpfile, False)) {
-       end_write_tmpfile();
-@@ -671,10 +678,16 @@
-     char   errfname[PATH_MAX];
-     FILE  *errfile;
-     char   str[400];
--    int	   status;
-+    int	   status, fd;
- 
-     /* make temp filename for any errors */
--    sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
-+    snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
-+    if ((fd = mkstemp(errfname)) == -1) {
-+	file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
-+	return 1;
-+    }
-+    close(fd);
-+    
-     /* direct any output from fig2dev to this file */
-     strcat(command, " 2> "); 
-     strcat(command, errfname); 
-diff -urNad xfig~/w_print.c xfig/w_print.c
---- xfig~/w_print.c
-+++ xfig/w_print.c
-@@ -295,9 +295,10 @@
- do_print_batch(Widget w)
- {
- 	FILE	   *infp,*outfp;
--	char	    tmp_exp_file[32];
-+	char	    tmp_exp_file[PATH_MAX];
- 	char	    str[255];
- 	char	    backgrnd[10], grid[80];
-+   int       fd;
- 
- 	if (writing_batch || emptyfigure_msg(print_msg))
- 		return;
-@@ -306,11 +307,20 @@
- 	/* this could happen if the user presses the button too fast */
- 	writing_batch = True;
- 
--	/* make a temporary name to write the batch stuff to */
--	sprintf(batch_file, "%s/%s%06d", TMPDIR, "xfig-batch", getpid());
- 	/* make a temporary name to write this figure to */
--	sprintf(tmp_exp_file, "%s/%s%06d", TMPDIR, "xfig-exp", getpid());
--	batch_exists = True;
-+	snprintf(tmp_exp_file, sizeof(tmp_exp_file), "%s/xfig-exp.XXXXXX",
-+		TMPDIR);
-+
-+	if (batch_exists != True) {
-+		/* make a temporary name to write the batch stuff to */
-+		sprintf(batch_file, "%s/xfig-batch.XXXXXX", TMPDIR);
-+		if ((fd = mkstemp(batch_file)) == -1) {
-+			file_msg("Error creating temporary file");
-+			return;
-+		}
-+		close(fd);
-+		batch_exists = True;
-+	}
- 	if (!print_popup) 
- 		create_print_panel(w);
- 
-@@ -323,6 +333,12 @@
- 	/* make a #rrggbb string from the background color */
- 	make_rgb_string(export_background_color, backgrnd);
- 
-+	if ((fd = mkstemp(tmp_exp_file)) == -1) {
-+		file_msg("Error creating temporary file");
-+		return;
-+	}
-+	close(fd);
-+
- 	/* get grid params and assemble into fig2dev parm */
- 	get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
- 
-diff -urNad xfig~/w_srchrepl.c xfig/w_srchrepl.c
---- xfig~/w_srchrepl.c
-+++ xfig/w_srchrepl.c
-@@ -788,7 +788,7 @@
-   char	 *cmd;
-   char	  str[300];
-   FILE	 *fp;
--  int	  len, i;
-+  int	  len, i, fd;
-   Boolean done = FALSE;
-   static int lines = 0;
- 
-@@ -804,9 +804,12 @@
-   }
-   lines = 0;
- 
--  sprintf(filename, "%s/xfig-spell.%d", TMPDIR, (int)getpid());
--  fp = fopen(filename, "w");
--  if (fp == NULL) {
-+  snprintf(filename, sizeof(filename), "%s/xfig-spell.XXXXXX", TMPDIR);
-+  if ((fd = mkstemp(filename)) == -1 || (fp = fdopen(fd, "w")) == NULL) {
-+    if (fd != -1) {
-+	unlink(filename);
-+	close(fd);
-+    }
-     file_msg("Can't open temporary file: %s: %s\n", filename, strerror(errno));
-   } else {
-     /* locate all text objects and write them to file fp */

diff --git a/xfig-3.2.5-rh490257.patch b/xfig-3.2.5-rh490257.patch
deleted file mode 100644
index cc58270..0000000
--- a/xfig-3.2.5-rh490257.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urNad xfig~/w_util.c xfig/w_util.c
---- xfig~/w_util.c
-+++ xfig/w_util.c
-@@ -932,21 +932,23 @@
-     DeclareArgs(4);
-     spin_struct *spins = (spin_struct*) info;
-     char	buf[200];
--    int		val, i, pos;
-+    int		val, i, modified = 0;
-+    XawTextPosition pos;
- 
-     /* save cursor position */
-     FirstArg(XtNinsertPosition, &pos);
-     GetValues(spins->widget);
- 
--    buf[sizeof(buf)-1]='\0';
--    strncpy(buf,panel_get_value(spins->widget),sizeof(buf));
-+    snprintf(buf, sizeof(buf), "%s", panel_get_value(spins->widget));
-+
-     for (i=0; i<strlen(buf); )
- 	/* delete any non-digits (including leading "-" when min >= 0 */
- 	if ((spins->min >= 0.0 && buf[i] == '-') || ((buf[i] < '0' || buf[i] > '9') && buf[i] != '-') || 
- 			(i != 0 && buf[i] == '-')) {
--	    strcpy(&buf[i],&buf[i+1]);
-+	    memmove(&buf[i], &buf[i+1], strlen(&buf[i]));
- 	    /* adjust cursor for char we just removed */
- 	    pos--;
-+	    modified = 1;
- 	} else {
- 	    i++;
- 	}
-@@ -954,15 +956,21 @@
-     if (strlen(buf) > 0 && !(strlen(buf)==1 && buf[0] == '-')) {
- 	val = atoi(buf);
- 	/* only check max.  If min is, say 3 and user wants to type 10, the 1 is too small */
--	if (val > (int) spins->max)
-+	if (val > (int) spins->max) {
- 	    val = (int) spins->max;
--	sprintf(buf,"%d", val);
-+	    sprintf(buf,"%d", val);
-+	    modified = 1;
-+        }
-     }
--    panel_set_value(spins->widget, buf);
--    /* put cursor back */
--    if (pos < strlen(buf)) {
--	FirstArg(XtNinsertPosition, pos+1);
--	SetValues(spins->widget);
-+
-+    if (modified) {
-+        panel_set_value(spins->widget, buf);
-+
-+	/* put cursor back */
-+	if (pos < strlen(buf)) {
-+	    FirstArg(XtNinsertPosition, (pos+1));
-+	    SetValues(spins->widget);
-+	}
-     }
- }
- 

diff --git a/xfig-3.2.5-rh490259.patch b/xfig-3.2.5-rh490259.patch
deleted file mode 100644
index d3c66b4..0000000
--- a/xfig-3.2.5-rh490259.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xfig.3.2.5.orig/w_msgpanel.c xfig.3.2.5/w_msgpanel.c
---- xfig.3.2.5.orig/w_msgpanel.c	2005-07-26 18:40:01.000000000 +0200
-+++ xfig.3.2.5/w_msgpanel.c	2009-03-19 14:21:11.000000000 +0100
-@@ -86,6 +86,8 @@
-     NextArg(XtNfromVert, cmd_form);
-     NextArg(XtNvertDistance, -INTERNAL_BW);
-     NextArg(XtNborderWidth, INTERNAL_BW);
-+    NextArg(XtNtopMargin, 1);
-+    NextArg(XtNbottomMargin, 1);
-     NextArg(XtNdisplayCaret, False);
-     NextArg(XtNtop, XtChainTop);
-     NextArg(XtNbottom, XtChainTop);

diff --git a/xfig-3.2.5-rh494193.patch b/xfig-3.2.5-rh494193.patch
deleted file mode 100644
index 1b10706..0000000
--- a/xfig-3.2.5-rh494193.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xfig.3.2.5a/w_print.c~ xfig.3.2.5a/w_print.c
---- xfig.3.2.5a/w_print.c~	2009-04-08 16:44:24.000000000 +0200
-+++ xfig.3.2.5a/w_print.c	2009-04-08 16:45:35.000000000 +0200
-@@ -958,7 +958,7 @@ void create_print_panel(Widget w)
- 	   var and put it into the widget */
- 	if (emptyname(printer_val)) {
- 		printer_val=getenv("PRINTER");
--		if (strchr(printer_val,'\\')) {
-+		if (printer_val && strchr(printer_val,'\\')) {
- 		    buf[0]='\0';
- 		    len=0;
- 		    for (i=0; i<strlen(printer_val); i++) {

diff --git a/xfig-3.2.5-zoom-crash.patch b/xfig-3.2.5-zoom-crash.patch
deleted file mode 100644
index d3abbcf..0000000
--- a/xfig-3.2.5-zoom-crash.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urNad xfig~/w_rulers.c xfig/w_rulers.c
---- xfig~/w_rulers.c
-+++ xfig/w_rulers.c
-@@ -1183,7 +1183,7 @@
- 	tickmod = 1;
- 
-     /* see how big a label is to adjust spacing, if necessary */
--    sprintf(number, "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
-+    snprintf(number, sizeof(number), "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
-     len = XTextWidth(roman_font, number, strlen(number));
-     while (skipx < (len + 5)/zoomscale) {
- 	skip *= 2;
-@@ -1197,11 +1197,11 @@
-       /* string */
-       if (i % skipx == 0) {
-         if ((i/10) % tickmod == 0)
--          sprintf(number, "%d%s", i/tickmod, cur_fig_units);
-+          snprintf(number, sizeof(number), "%d%s", i/tickmod, cur_fig_units);
- 	else if (i % tickmod == 0)
--          sprintf(number, "%d", i/tickmod);
-+          snprintf(number, sizeof(number), "%d", i/tickmod);
-         else
--          sprintf(number, precstr, (float)(1.0 * i / tickmod));
-+          snprintf(number, sizeof(number), precstr, (float)(1.0 * i / tickmod));
- 	/* get length of string to position it */
- 	len = XTextWidth(roman_font, number, strlen(number));
-         /* we center on the number only, letting the minus sign hang out */
-@@ -1456,11 +1456,11 @@
-       /* string */
-       if (i % skipx == 0) {
-         if ((i/10) % tickmod == 0)
--          sprintf(number, "%d%s", i/tickmod, cur_fig_units);
-+          snprintf(number, sizeof(number), "%d%s", i/tickmod, cur_fig_units);
- 	else if (i % tickmod == 0)
--          sprintf(number, "%d", i/tickmod);
-+          snprintf(number, sizeof(number), "%d", i/tickmod);
-         else
--          sprintf(number, precstr, (float)(1.0 * i / tickmod));
-+          snprintf(number, sizeof(number), precstr, (float)(1.0 * i / tickmod));
- 	/* get length of string to position it */
- 	len = XTextWidth(roman_font, number, strlen(number));
- 	/* vertically centered on inch/cm mark */

diff --git a/xfig.spec b/xfig.spec
index 2c8fff2..a044659 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,32 +3,22 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 22.a%{?dist}
+Release: 23.b%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
-# The new upstream 3.2.5a release was made available to me (Hans) by the Debian
-# maintainer who is in contact with upstream, which appearantly is still
-# somewhat alive (but not alive enough to put the tarbal on the homepage ??)
-Source0: xfig.%{version}a.tar.gz
+Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}b.full.tar.gz
 Source1: xfig.png
 Source2: xfig.desktop
 Source3: xfig.sh
 
 Patch0: xfig-3.2.5a-default-apps.patch
 Patch1: xfig-3.2.5-fhs.patch
-Patch2: xfig-3.2.5-mkstemp.diff
 Patch7: xfig.3.2.5-modularX.patch
 Patch9: xfig.3.2.5-Xaw3d.patch
 Patch10: xfig-3.2.5-enable-Xaw3d.patch
-Patch11: xfig-3.2.5-color-resources.patch
 Patch13: xfig-3.2.5-urwfonts.patch
-Patch14: xfig-3.2.5-zoom-crash.patch
-Patch15: xfig-3.2.5-missing-protos.patch
-Patch17: xfig-3.2.5-rh490257.patch
-Patch18: xfig-3.2.5-rh490259.patch
 Patch19: xfig-3.2.5-debian.patch
-Patch20: xfig-3.2.5-rh494193.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -94,22 +84,17 @@ Files common to both the plain Xaw and the Xaw3d version of xfig.
 
 
 %prep
-%setup -q -n xfig.%{version}a
+%setup -q -n xfig.%{version}b
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .fhs
-%patch2 -p1 -b .mkstemp
 %patch7 -p1 -b .modularX
 %patch9 -p1 -b .Xaw3d
 %patch10 -p1 -b .no-Xaw3d
-%patch11 -p1 -b .color-resources
 %patch13 -p1 -b .urw
-%patch14 -p1 -b .zoom-crash
-%patch15 -p1
-%patch17 -p1
-%patch18 -p1
 %patch19 -p1
-%patch20 -p1
+iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
 rm Doc/html/images/sav1a0.tmp
+chmod -x `find -type f`
 
 
 %build
@@ -199,6 +184,10 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-23.b
+- New upstream 3.2.5b release
+- Drop many merged patches
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-22.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild