- fix #191825, buildrequire on imake

- fix #173748, fig2dev still refers to /usr/X11R6/lib/X11/rgb.txt

transfig.spec

@@ -1,11 +1,7 @@
-%define xfig_libdir %{_datadir}/xfig
-%define fig2dev_libdir %{_datadir}/fig2dev
-%define imake %(which imake)
-
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Name: transfig
 Version: 3.2.4
-Release: 13.2
+Release: 14
 Epoch: 1
 License: distributable
 Group: Applications/Multimedia
@@ -16,10 +12,11 @@ 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
 
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
-BuildRequires: %{imake}
+BuildRequires: imake
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -40,34 +37,26 @@ figures into certain graphics languages.
 %patch2 -p1 -b .broken
 %patch3 -p1 -b .badc
 %patch4 -p1 -b .rgb
+%patch5 -p1 -b .modularX
 
 %build
-export IMAKEINCLUDE="-I/usr/share/X11/config"
 xmkmf
-make Makefiles XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
-make XFIGLIBDIR=%{xfig_libdir} FIG2DEV_LIBDIR=%{fig2dev_libdir}
+make Makefiles
+make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT%{fig2dev_libdir} \
-         $RPM_BUILD_ROOT%{xfig_libdir}
-
-make BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-     FIG2DEV_LIBDIR=$RPM_BUILD_ROOT%{fig2dev_libdir} \
-     XFIGLIBDIR=$RPM_BUILD_ROOT%{xfig_libdir} \
-     MANSOURCEPATH=$RPM_BUILD_ROOT%{_mandir}/man \
-     DOCDIR=$RPM_BUILD_ROOT/%{_docdir} \
-     install install.man
+make DESTDIR=%{buildroot} install install.man
 
 # Dunno why these are not installed
 for i in fig2ps2tex fig2ps2tex.sh pic2tpic
 do
-	install -c -m 755 fig2dev/$i.script $RPM_BUILD_ROOT%{_bindir}/$i
+	install -c -m 755 fig2dev/$i.script %{buildroot}%{_bindir}/$i
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -78,10 +67,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fig2ps2tex.sh
 %{_bindir}/pic2tpic
 %{_mandir}/man1/*
-%{fig2dev_libdir}
-%{xfig_libdir}
+%{_datadir}/xfig
+%{_datadir}/fig2dev
 
 %changelog
+* Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-14
+- fix #191825, buildrequire on imake
+- fix #173748, fig2dev still refers to /usr/X11R6/lib/X11/rgb.txt
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:3.2.4-13.2
 - bump again for double-long bug on ppc(64)