Mon Apr 16 13:15:18 UTC 2007

Author: than

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

Modified Files:
	.cvsignore sources xfig.spec 
Added Files:
	xfig-3.2.5-fhs.patch xfig-3.2.5-mkstemp.diff 
	xfig-3.2.5-pdfviewer.patch xfig.3.2.5-Xaw3d.patch 
	xfig.3.2.5-modularX.patch 
Removed Files:
	xfig-3.2.4-fhs.patch xfig-3.2.4-fonts.patch 
	xfig-3.2.4-mkstemp.diff xfig-3.2.4-pdfviewer.patch 
	xfig.3.2.4-buffer.patch xfig.3.2.4-cleanup.patch 
	xfig.3.2.4-modularX.patch xfig.3.2.4-xaw3d.patch 
	xfig.3.2.4-xpm.patch 
Log Message:
3.2.5


xfig-3.2.5-fhs.patch:
 Imakefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE xfig-3.2.5-fhs.patch ---
--- xfig.3.2.5/Imakefile.fhs	2006-10-11 01:19:22.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:04:45.000000000 +0200
@@ -169,13 +169,11 @@
 XFIGLIBDIR = $(LIBDIR)/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = $(DOCDIR)/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
-XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-MANDIR = /usr/local/xfig/man
+MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR

xfig-3.2.5-mkstemp.diff:
 f_readeps.c  |   27 ++++++++++++++++++++-------
 f_readgif.c  |   10 ++++++++--
 f_readppm.c  |   10 ++++++++--
 f_readtif.c  |   11 ++++++++---
 f_util.c     |   16 +++++++++++-----
 main.c       |   15 ++++++++++++---
 mode.c       |    2 +-
 u_print.c    |   19 ++++++++++++++++---
 w_print.c    |   26 +++++++++++++++++++++-----
 w_srchrepl.c |   11 +++++++----
 10 files changed, 112 insertions(+), 35 deletions(-)

--- NEW FILE xfig-3.2.5-mkstemp.diff ---
--- xfig.3.2.5/f_readtif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readtif.c	2007-04-16 14:05:22.000000000 +0200
@@ -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",
--- xfig.3.2.5/u_print.c.mkstemp	2006-02-24 21:18:11.000000000 +0100
+++ xfig.3.2.5/u_print.c	2007-04-16 14:05:22.000000000 +0200
@@ -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();
@@ -648,10 +655,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); 
--- xfig.3.2.5/f_util.c.mkstemp	2007-01-16 18:58:18.000000000 +0100
+++ xfig.3.2.5/f_util.c	2007-04-16 14:05:22.000000000 +0200
@@ -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");
--- xfig.3.2.5/main.c.mkstemp	2007-01-15 01:24:26.000000000 +0100
+++ xfig.3.2.5/main.c	2007-04-16 14:05:22.000000000 +0200
@@ -653,8 +653,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 */
@@ -1669,7 +1671,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);
     }
 }
 
--- xfig.3.2.5/w_print.c.mkstemp	2005-07-26 18:40:01.000000000 +0200
+++ xfig.3.2.5/w_print.c	2007-04-16 14:05:22.000000000 +0200
@@ -294,9 +294,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;
@@ -305,11 +306,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);
 
@@ -322,6 +332,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);
 
--- xfig.3.2.5/f_readppm.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readppm.c	2007-04-16 14:05:22.000000000 +0200
@@ -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) {
--- xfig.3.2.5/f_readgif.c.mkstemp	2005-07-26 18:39:59.000000000 +0200
+++ xfig.3.2.5/f_readgif.c	2007-04-16 14:05:22.000000000 +0200
@@ -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 | ppmtopcx > %s 2> /dev/null", pcxname);
 	if ((giftopcx = popen(buf,"w" )) == 0) {
--- xfig.3.2.5/w_srchrepl.c.mkstemp	2005-07-26 18:40:02.000000000 +0200
+++ xfig.3.2.5/w_srchrepl.c	2007-04-16 14:05:22.000000000 +0200
@@ -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 */
--- xfig.3.2.5/f_readeps.c.mkstemp	2005-10-31 18:40:38.000000000 +0100
+++ xfig.3.2.5/f_readeps.c	2007-04-16 14:19:32.000000000 +0200
@@ -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 */
--- xfig.3.2.5/mode.c.mkstemp	2005-07-26 18:40:00.000000000 +0200
+++ xfig.3.2.5/mode.c	2007-04-16 14:05:22.000000000 +0200
@@ -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 */

xfig-3.2.5-pdfviewer.patch:
 Fig.ad |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfig-3.2.5-pdfviewer.patch ---
--- xfig.3.2.5/Fig.ad.pdfviewer	2007-04-16 14:31:39.000000000 +0200
+++ xfig.3.2.5/Fig.ad	2007-04-16 14:31:56.000000000 +0200
@@ -24,7 +24,7 @@
 
 ! pdfviewer - put your favorite pdf viewer here.  
 !		This is for viewing the xfig how-to guide and man pages
-Fig.pdfviewer:			/usr/bin/xpdf %f
+Fig.pdfviewer:			/usr/bin/evince %f
 
 ! Spell check program - put your favorite spelling check program here.
 !		It must write the misspelled words to standard output.

xfig.3.2.5-Xaw3d.patch:
 Imakefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfig.3.2.5-Xaw3d.patch ---
--- xfig.3.2.5/Imakefile.Xaw3d	2007-04-16 14:56:58.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:57:26.000000000 +0200
@@ -50,7 +50,7 @@
 XCOMM Uncomment the following definition for XAW3D if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
 
-#define XAW3D
+XCOMM #define XAW3D
 
 XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
 XCOMM some new features, including "Tips", which replace xfig's "help balloons"

xfig.3.2.5-modularX.patch:
 Imakefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE xfig.3.2.5-modularX.patch ---
--- xfig.3.2.5/Imakefile.modularX	2007-04-16 14:27:49.000000000 +0200
+++ xfig.3.2.5/Imakefile	2007-04-16 14:29:18.000000000 +0200
@@ -45,7 +45,7 @@
 XCOMM different tree than the "correct" tree that your X system expects. The usual
 XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
 
-XCOMM XAPPLOADDIR = /home/user/xfig
+XAPPLOADDIR = /usr/share/X11/app-defaults
 
 XCOMM Uncomment the following definition for XAW3D if you want to use
 XCOMM the 3d Athena Widget Set (highly recommended!)
@@ -166,14 +166,14 @@
 XCOMM XFIGLIBDIR = $(LIBDIR)
 
 XCOMM use this if you want the multi-key data base file in the standard X11 tree
-XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGLIBDIR = /usr/share/xfig
 
 XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
 XFIGDOCDIR = $(DOCDIR)/xfig
 
 XCOMM MANDIR tells where the standard man pages should go (no need to change it
 XCOMM if you want the man pages installed in the standard place on your system
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+MANDIR = /usr/share/man/man1
 
 XCOMM If your system doesn't have strstr undefine the following definition
 XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 14:49:08 -0000	1.4
+++ .cvsignore	16 Apr 2007 13:15:16 -0000	1.5
@@ -1 +1,2 @@
 xfig.3.2.4.full.tar.gz
+xfig.3.2.5.full.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 14:49:08 -0000	1.4
+++ sources	16 Apr 2007 13:15:16 -0000	1.5
@@ -1 +1 @@
-1911fc0f733cb2f40336a8d0e82513de  xfig.3.2.4.full.tar.gz
+fae0c67a3951bd41c057deb63b6aa47a  xfig.3.2.5.full.tar.gz


Index: xfig.spec
===================================================================
RCS file: /cvs/dist/rpms/xfig/devel/xfig.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xfig.spec	12 Jul 2006 08:53:27 -0000	1.39
+++ xfig.spec	16 Apr 2007 13:15:16 -0000	1.40
@@ -2,8 +2,8 @@
 
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
-Version: 3.2.4
-Release: 21.1
+Version: 3.2.5
+Release: 1%{?dist}
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -12,36 +12,32 @@
 Source2: xfig.desktop
 
 Patch0: xfig-3.2.4-redhat.patch
-Patch1: xfig-3.2.4-fhs.patch
-Patch2: xfig-3.2.4-mkstemp.diff
-Patch3: xfig.3.2.4-cleanup.patch
-Patch4: xfig-3.2.4-fonts.patch
-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-pdfviewer.patch
-Patch9: xfig.3.2.4-xaw3d.patch
+Patch1: xfig-3.2.5-fhs.patch
+Patch2: xfig-3.2.5-mkstemp.diff
+Patch7: xfig.3.2.5-modularX.patch
+Patch8: xfig-3.2.5-pdfviewer.patch
+Patch9: xfig.3.2.5-Xaw3d.patch
 
-Requires: transfig >= 1:3.2.4-12
+Requires: transfig >= 1:3.2.5
 Requires: evince
 Requires: ImageMagick
 Requires: aspell
 Requires: htmlview
 
-BuildPrereq: libjpeg-devel
-BuildPrereq: libpng-devel
-BuildPrereq: imake
-BuildPrereq: libICE-devel
-BuildPrereq: libSM-devel
-BuildPrereq: libX11-devel
-BuildPrereq: libXaw-devel
-BuildPrereq: libXext-devel
-BuildPrereq: libXi-devel
-BuildPrereq: libXmu-devel
-BuildPrereq: libXpm-devel
-BuildPrereq: libXt-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: imake
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXaw-devel
+BuildRequires: libXext-devel
+BuildRequires: libXi-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXt-devel
 
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -58,13 +54,9 @@
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .fhs
 %patch2 -p1 -b .mkstemp
-%patch3 -p1 -b .cleanup
-%patch4 -p1 -b .fonts
-%patch5 -p1 -b .buffer
-%patch6 -p1 -b .xpm
 %patch7 -p1 -b .modularX
 %patch8 -p1 -b .pdfviewer
-%patch9 -p1 -b .xaw3d
+%patch9 -p1 -b .Xaw3d
 
 %build
 xmkmf
@@ -102,6 +94,9 @@
 %{_datadir}/applications/*
 
 %changelog
+* Mon Apr 16 2007 Than Ngo <than at redhat.com> - 3.2.5-1.fc7
+- 3.2.5
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 3.2.4-21.1
 - rebuild
 


--- xfig-3.2.4-fhs.patch DELETED ---


--- xfig-3.2.4-fonts.patch DELETED ---


--- xfig-3.2.4-mkstemp.diff DELETED ---


--- xfig-3.2.4-pdfviewer.patch DELETED ---


--- xfig.3.2.4-buffer.patch DELETED ---


--- xfig.3.2.4-cleanup.patch DELETED ---


--- xfig.3.2.4-modularX.patch DELETED ---


--- xfig.3.2.4-xaw3d.patch DELETED ---


--- xfig.3.2.4-xpm.patch DELETED ---


