rpms/xforms/devel xforms.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	xforms.spec 
Log Message:
* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
- BR: libGL.so.1 -> BR: %x_pkg-Mesa-libGL 
- remove legacy crud



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xforms.spec	17 Oct 2005 14:28:54 -0000	1.9
+++ xforms.spec	17 Oct 2005 15:55:36 -0000	1.10
@@ -3,7 +3,7 @@
 Name:    xforms
 Summary: X11 toolkit library
 Version: 1.0.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -12,12 +12,12 @@
 Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# xpm.h, glx.h
 BuildRequires: XFree86-devel
-BuildRequires: libGL.so.1
+%define x_pkg %{expand:%%(basename `rpm -q --qf "%%{NAME}" --whatprovides XFree86-devel` -devel)}
+BuildRequires: %{x_pkg}-Mesa-libGL
 BuildRequires: libjpeg-devel
 
-# for xforms' import/export of various image types, including: png, sgi
+# for import/export of various image types, including: png, sgi
 Requires: netpbm-progs
 
 
@@ -34,13 +34,8 @@
 Summary: Development files for the xforms toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-# legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{version}-%{release}
-#Provides:  %{name}-designer = %{version}-%{release}
-Obsoletes: %{name}-static < %{version}-%{release}
-#Provides:  %{name}-static = %{version}-%{release}
 %description devel
-This package contains development headers and libraries for %{name}.
+%{summary}.
 
 
 %prep
@@ -90,6 +85,10 @@
 
 
 %changelog
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
+- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL 
+- remove legacy crud
+
 * Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-1
 - 1.0.90
 - new version removes use-of/references-to xmkmf,/usr/X11R6 (#170942)