SPECS: xfig.spec - added c patch (fixes build with gcc 4) - switch...

[qboosh]

Author: qboosh                       Date: Fri Oct 27 23:45:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added c patch (fixes build with gcc 4)
- switched to modular xorg

---- Files affected:
SPECS:
   xfig.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/xfig.spec
diff -u SPECS/xfig.spec:1.66 SPECS/xfig.spec:1.67
--- SPECS/xfig.spec:1.66	Fri Oct 27 18:39:36 2006
+++ SPECS/xfig.spec	Sat Oct 28 01:45:03 2006
@@ -11,7 +11,7 @@
 Summary(uk):	śÎÓÔŇŐÍĹÎÔ ÄĚŃ ÍÁĚŔ×ÁÎÎŃ ĐŇĎÓÔϧ ×ĹËÔĎŇÎϧ ÇŇÁĆŚËÉ
 Name:		xfig
 Version:	3.2.5
-Release:	0.%{_pre}.4
+Release:	0.%{_pre}.5
 License:	Freeware
 Group:		X11/Applications/Graphics
 #Source0:	http://xfig.org/software/xfig/%{version}/%{name}.%{version}.full.tar.gz
@@ -22,17 +22,22 @@
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-i18n.patch
 Patch2:		%{name}-mkstemp.diff
+Patch3:		%{name}-c.patch
 URL:		http://www.xfig.org/
-BuildRequires:	XFree86-devel
-BuildRequires:	Xaw3d-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-util-gccmakedep
+BuildRequires:	xorg-util-imake
 Requires:	netpbm-progs
 Requires:	transfig >= 3.2.4-3
+Requires:	xorg-lib-libXt >= 1.0.0
 Obsoletes:	xfig-doc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_appdefsdir	%{_datadir}/X11/app-defaults
 
 %description
 This program gives you all the features you need to create basic- to
@@ -85,16 +90,17 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 xmkmf -a
 %{__make} \
 	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags}" \
-	CXXDEBUGFLAGS="%{rpmcflags}" \
 	LOCAL_LDFLAGS="%{rpmldflags}" \
 	XFIGLIBDIR=%{_datadir}/xfig \
-	XFIGDOCDIR=%{_docdir}/%{name}-%{version}
+	XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
+	XPMINC="-I/usr/include/X11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +109,7 @@
 %{__make} install install.man \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
+	CONFDIR=%{_datadir}/X11 \
 	MANPATH=%{_mandir} \
 	XFIGLIBDIR=%{_datadir}/xfig
 
@@ -138,6 +145,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/10/27 23:45:03  qboosh
+- added c patch (fixes build with gcc 4)
+- switched to modular xorg
+
 Revision 1.66  2006/10/27 16:39:36  qboosh
 - updated Source0 URL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfig.spec?r1=1.66&r2=1.67&f=u