[rpms/xfig] epel10: fix for modular X

[Than Ngo <than@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/xfig
Branch : epel10
Commit : c2584c9be9448cc92ed66ad5565f53c8c2aed399
Author : Than Ngo <than@fedoraproject.org>
Date   : 2005-11-15T13:26:06+00:00
Stats  : +42/-32 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/xfig/c/c2584c9be9448cc92ed66ad5565f53c8c2aed399?branch=epel10

Log:
fix for modular X

---
diff --git a/xfig.spec b/xfig.spec
index 5480fc3..7ec168f 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -1,10 +1,10 @@
-%define desktop_file 1
-%define desktop_file_utils_version 0.2.90
+%define imake %(which imake)
+%define app_defaults_dir /etc/X11/app-defaults
 
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.4
-Release: 14
+Release: 15
 License: Freeware
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -19,8 +19,9 @@ 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
 
-Requires: transfig >= 1:3.2.4
+Requires: transfig >= 1:3.2.4-12
 Requires: xpdf
 Requires: ImageMagick
 Requires: aspell
@@ -28,13 +29,18 @@ Requires: htmlview
 
 BuildPrereq: libjpeg-devel
 BuildPrereq: libpng-devel
-BuildPrereq: xorg-x11-devel
-
-%if %{desktop_file}
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
-%endif
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+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
+
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -55,48 +61,52 @@ graphics.
 %patch4 -p1 -b .fonts
 %patch5 -p1 -b .buffer
 %patch6 -p1 -b .xpm
+%patch7 -p1 -b .modularX
 
 %build
-export PATH=$PATH:/usr/X11R6/bin
 xmkmf
 ln -nfs Doc/xfig.man xfig.man
 make DOCDIR=%{_docdir}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} install install.all
+make DESTDIR=%{buildroot} \
+     DOCDIR=%{_docdir} \
+     XAPPLOADDIR=%{app_defaults_dir} \
+     install install.all
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps
+mkdir -p %{buildroot}/usr/share/pixmaps \
+         %{buildroot}%{_datadir}/applications
 
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
 
-%if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/applications/net-xfig.desktop
-%else
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Graphics
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/applnk/Graphics/
-%endif
+mv $RPM_BUILD_ROOT%{_bindir}/xfig %{buildroot}%{_bindir}/xfig.bin
+cat > %{buildroot}%{_bindir}/%{name} <<EOF
+#! /bin/sh
+export XAPPLRESDIR=%{app_defaults_dir}
+exec %{_bindir}/%{name}.bin
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/X11R6/bin/*
-/usr/X11R6/lib/X11/%{name}/*
-/usr/X11R6/man/*/*
-/usr/share/pixmaps/%{name}.png
 %doc %{_docdir}/%{name}
-/usr/X11R6/lib/X11/app-defaults/*
-%if %{desktop_file}
+%attr(0755,root,root) %{_bindir}/xfig
+%{_bindir}/xfig.bin
+%{_datadir}/%{name}/*
+%{_mandir}/*/*
+%{_datadir}/pixmaps/%{name}.png
+%{app_defaults_dir}/*
 %{_datadir}/applications/*
-%else
-/etc/X11/applnk/Graphics/%{name}.desktop
-%endif
 
 %changelog
+* Tue Nov 15 2005 Than Ngo <than@redhat.com> 3.2.4-15
+- fix for modular X 
+
 * Mon Oct 24 2005 Than Ngo <than@redhat.com> 3.2.4-14
 - enable xpm support #158422