SPECS: wxWidgets.spec - switched to modular xorg, release 3

[qboosh]

Author: qboosh                       Date: Mon Mar  6 07:21:38 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- switched to modular xorg, release 3

---- Files affected:
SPECS:
   wxWidgets.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/wxWidgets.spec
diff -u SPECS/wxWidgets.spec:1.45 SPECS/wxWidgets.spec:1.46
--- SPECS/wxWidgets.spec:1.45	Mon Mar  6 08:19:57 2006
+++ SPECS/wxWidgets.spec	Mon Mar  6 08:21:32 2006
@@ -11,7 +11,7 @@
 Summary(pl):	Biblioteka wxWidgets
 Name:		wxWidgets
 Version:	2.6.2
-Release:	2
+Release:	3
 License:	wxWidgets Licence (LGPL with exception)
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
@@ -24,7 +24,7 @@
 Patch5:		%{name}-intl.patch
 Patch6:		%{name}-gcc4.patch
 URL:		http://www.wxWidgets.org/
-BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-GLU-devel
 #BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
@@ -43,6 +43,7 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+%{?with_x11:BuildRequires:	xorg-lib-libXext-devel}
 # these are not supported by wxWidgets
 Obsoletes:	LDAPExplorerTool <= 0.6-1
 Obsoletes:	abridge <= 0.4.0-1
@@ -242,7 +243,6 @@
 Summary(pl):	Biblioteka GL dla wxGTK2
 Group:		X11/Libraries
 Requires:	wxGTK2 = %{version}-%{release}
-Requires:	OpenGL
 Obsoletes:	wxGTK2-univ-gl
 
 %description -n wxGTK2-gl
@@ -257,7 +257,7 @@
 Group:		X11/Development/Libraries
 Requires:	wxGTK2-devel = %{version}-%{release}
 Requires:	wxGTK2-gl = %{version}-%{release}
-Requires:	OpenGL-devel
+Requires:	OpenGL-GLU-devel
 Obsoletes:	wxGTK2-univ-gl-devel
 
 %description -n wxGTK2-gl-devel
@@ -300,7 +300,6 @@
 Summary(pl):	Biblioteka GL dla wxGTK2 z obsługą UNICODE
 Group:		X11/Libraries
 Requires:	wxGTK2-unicode = %{version}-%{release}
-Requires:	OpenGL
 Obsoletes:	wxGTK2-univ-unicode-gl
 
 %description -n wxGTK2-unicode-gl
@@ -315,7 +314,7 @@
 Group:		X11/Development/Libraries
 Requires:	wxGTK2-unicode-devel = %{version}-%{release}
 Requires:	wxGTK2-unicode-gl = %{version}-%{release}
-Requires:	OpenGL-devel
+Requires:	OpenGL-GLU-devel
 Obsoletes:	wxGTK2-univ-unicode-gl-devel
 
 %description -n wxGTK2-unicode-gl-devel
@@ -370,7 +369,6 @@
 Summary(pl):	Biblioteka GL dla opartej na wxUniversal wxX11
 Group:		X11/Libraries
 Requires:	wxX11 = %{version}-%{release}
-Requires:	OpenGL
 Obsoletes:	wxX11-univ-gl
 
 %description -n wxX11-gl
@@ -385,7 +383,7 @@
 Group:		X11/Development/Libraries
 Requires:	wxX11-gl = %{version}-%{release}
 Requires:	wxX11-devel = %{version}-%{release}
-Requires:	OpenGL-devel
+Requires:	OpenGL-GLU-devel
 Obsoletes:	wxX11-univ-gl-devel
 
 %description -n wxX11-gl-devel
@@ -426,7 +424,6 @@
 Summary(pl):	Biblioteka GL dla opartej na wxUniversal wxX11 z obsługą UNICODE
 Group:		X11/Libraries
 Requires:	wxX11-unicode = %{version}-%{release}
-Requires:	OpenGL
 Obsoletes:	wxX11-univ-unicode-gl
 
 %description -n wxX11-unicode-gl
@@ -441,7 +438,7 @@
 Group:		X11/Development/Libraries
 Requires:	wxX11-unicode-gl = %{version}-%{release}
 Requires:	wxX11-unicode-devel = %{version}-%{release}
-Requires:	OpenGL-devel
+Requires:	OpenGL-GLU-devel
 Obsoletes:	wxX11-univ-unicode-gl-devel
 
 %description -n wxX11-unicode-gl-devel
@@ -799,6 +796,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/03/06 07:21:32  qboosh
+- switched to modular xorg, release 3
+
 Revision 1.45  2006/03/06 07:19:57  qboosh
 - use proper files in *-gl* packages
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wxWidgets.spec?r1=1.45&r2=1.46&f=u