diff --git a/.cvsignore b/.cvsignore
index c4ac552..9de7ff7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 transfig.3.2.4.tar.gz
+transfig.3.2.5.tar.gz
diff --git a/sources b/sources
index a99faba..ed83e2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-742de0f7a3cae74d247bbd0c70dd9dd7  transfig.3.2.4.tar.gz
+3b2cffdd25529ae5877e305f29aae6d1  transfig.3.2.5.tar.gz
diff --git a/transfig-3.2.5-modularX.patch b/transfig-3.2.5-modularX.patch
new file mode 100644
index 0000000..a17ddb8
--- /dev/null
+++ b/transfig-3.2.5-modularX.patch
@@ -0,0 +1,29 @@
+--- transfig.3.2.5/fig2dev/Imakefile.modularx	2007-04-16 14:49:29.000000000 +0200
++++ transfig.3.2.5/fig2dev/Imakefile	2007-04-16 14:51:15.000000000 +0200
+@@ -34,7 +34,7 @@
+ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
+ XCOMM and installed xfig.
+ 
+-XFIGLIBDIR =	/usr/local/lib/X11/xfig
++XFIGLIBDIR =	$(PROJECTROOT)/share/xfig
+ 
+ XCOMM ******
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
+@@ -62,7 +62,7 @@
+ XCOMM the full name (rgb.txt) now.
+ XCOMM
+ 
+-RGB = $(LIBDIR)/rgb.txt
++RGB = $(PROJECTROOT)/share/X11/rgb.txt
+ 
+ XCOMM Comment out the following #define USEPNG if you don't want PNG support
+ XCOMM Uncomment the #define for USEPNG if you want to be able to import
+@@ -141,7 +141,7 @@
+ 
+ #ifdef I18N
+ I18N_DEFS = -DI18N 
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
++FIG2DEV_LIBDIR = $(PROJECTROOT)/share/fig2dev
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
+ 
+ #endif /* I18N */
diff --git a/transfig.spec b/transfig.spec
index e78e29e..5164a17 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -1,18 +1,13 @@
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
-Version: 3.2.4
-Release: 16
+Version: 3.2.5
+Release: 1%{?dist}
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
 Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz
 
-Patch0: transfig.3.2.4-strerror.patch
-Patch1: transfig-3.2.4-gcc33.patch
-Patch2: transfig.3.2.4-broken.patch
-Patch3: transfig-3.2.4-badc.patch
-Patch4: transfig.3.2.4-rgb.patch
-Patch5: transfig-3.2.4-modularX.patch
+Patch5: transfig-3.2.5-modularX.patch
 Patch6: transfig.3.2.4-pstex.patch
 
 Requires:	ghostscript
@@ -21,7 +16,7 @@ BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
 BuildRequires: imake
 
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The transfig utility creates a makefile which translates FIG (created
@@ -35,11 +30,7 @@ figures into certain graphics languages.
 
 %prep
 %setup -q -n %{name}.%{version}
-%patch0 -p1 -b .strerror
-%patch1 -p1 -b .gcc33
-%patch2 -p1 -b .broken
-%patch3 -p1 -b .badc
-%patch4 -p1 -b .rgb
+
 %patch5 -p1 -b .modularX
 %patch6 -p1 -b .pstex
 
@@ -75,6 +66,9 @@ rm -rf %{buildroot}
 %{_datadir}/fig2dev
 
 %changelog
+* Mon Apr 16 2007 Than Ngo <than@redhat.com> - 1:3.2.5-1.fc7
+- 3.2.5
+
 * Wed Aug 16 2006 Stepan Kasal <skasal@redhat.com> - 1:3.2.4-16
 - Require ghostscript; fig2dev calls it.