rpms/xforms/FC-5 xforms.spec,1.17,1.18

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/xforms/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16631

Modified Files:
	xforms.spec 
Log Message:
* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-7
- cleanup



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-5/xforms.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xforms.spec	1 Mar 2006 15:55:08 -0000	1.17
+++ xforms.spec	8 Aug 2006 15:41:47 -0000	1.18
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 6%{?dist}.2
+Release: 7%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -17,9 +17,11 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
-BuildRequires: libXpm-devel
 %define x_deps libX11-devel libXpm-devel
+%else
+%define x_deps xorg-x11-devel
 %endif
+BuildRequires: %{x_deps}
 
 # import/export: png, sgi (optional?)
 Requires: netpbm-progs
@@ -40,7 +42,7 @@
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
+Requires: %{x_deps}
 Requires: libjpeg-devel
 %description devel
 %{summary}.
@@ -59,8 +61,7 @@
   --disable-static \
   --enable-optimization="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} \
-  X_PRE_LIBS=''
+make %{?_smp_mflags} X_PRE_LIBS=""
 
 
 %install
@@ -95,7 +96,10 @@
 
 
 %changelog 
-* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-7
+- cleanup
+
+* Wed Mar 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6