rpms/xforms/devel xforms.spec,1.11,1.12

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5486

Modified Files:
	xforms.spec 
Log Message:
modular X fixes



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xforms.spec	17 Oct 2005 19:26:33 -0000	1.11
+++ xforms.spec	19 Dec 2005 19:34:41 -0000	1.12
@@ -1,4 +1,3 @@
-# $Id$
 
 Name:    xforms
 Summary: XForms toolkit library
@@ -14,8 +13,10 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
-# coming soon
-# BuildRequires: libXpm-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
 
 # import/export: png, sgi (optional?)
 Requires: netpbm-progs
@@ -36,6 +37,7 @@
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 %description devel
 %{summary}.
 
@@ -86,6 +88,10 @@
 
 
 %changelog 
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel 
+
 * Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-3
 - BR: libGL-devel
 - #BR: libXpm-devel (coming soon)