SPECS: wxWidgets.spec - use proper files in *-gl* packages

[qboosh]

Author: qboosh                       Date: Mon Mar  6 07:20:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use proper files in *-gl* packages

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

---- Diffs:

================================================================
Index: SPECS/wxWidgets.spec
diff -u SPECS/wxWidgets.spec:1.44 SPECS/wxWidgets.spec:1.45
--- SPECS/wxWidgets.spec:1.44	Wed Feb  1 19:19:06 2006
+++ SPECS/wxWidgets.spec	Mon Mar  6 08:19:57 2006
@@ -25,7 +25,7 @@
 Patch6:		%{name}-gcc4.patch
 URL:		http://www.wxWidgets.org/
 BuildRequires:	OpenGL-devel
-BuildRequires:	SDL-devel
+#BuildRequires:	SDL-devel
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
 #BuildRequires:	bakefile >= 0.1.9
@@ -34,7 +34,7 @@
 BuildRequires:	expat-devel
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel
+BuildRequires:	gtk+2-devel >= 2.0.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libmspack-devel
@@ -648,7 +648,6 @@
 %define _libf %{?with_debug:d}
 %define _configf %{?with_debug:-debug-2.6}
 
-
 %files -f wxstd.lang
 %defattr(644,root,root,755)
 %doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt
@@ -701,45 +700,45 @@
 %files -n wxGTK2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*.so.*.*
-%exclude %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so.*.*
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-devel
 %defattr(644,root,root,755)
 %{_libdir}/libwx_gtk2%{_libf}_*-*.so
-%exclude %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so
 %{_libdir}/wx/config/gtk2-ansi-*
 %{_libdir}/wx/include/gtk2-ansi-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-ansi%{_configf}-config
 
 %files -n wxGTK2-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2%{_libf}_ogl-*.so
+%{_libdir}/libwx_gtk2%{_libf}_gl-*.so
 %endif
 
 %files -n wxGTK2-unicode
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.*.*
-%exclude %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so.*.*
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-unicode-devel
 %defattr(644,root,root,755)
 %{_libdir}/libwx_gtk2u%{_libf}_*-*.so
-%exclude %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so
 %{_libdir}/wx/config/gtk2-unicode-*
 %{_libdir}/wx/include/gtk2-unicode-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-unicode%{_configf}-config
 
 %files -n wxGTK2-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
 
 %files -n wxGTK2-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_gtk2u%{_libf}_ogl-*.so
+%{_libdir}/libwx_gtk2u%{_libf}_gl-*.so
 
 %if %{with x11}
 %if %{with ansi}
@@ -753,45 +752,45 @@
 %defattr(644,root,root,755)
 %doc docs/wxX11-readme.txt
 %attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so.*.*
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-devel
 %defattr(644,root,root,755)
 %{_libdir}/libwx_x11univ%{_libf}_*-*.so
-%exclude %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so
 %{_libdir}/wx/config/x11univ-ansi-*
 %{_libdir}/wx/include/x11univ-ansi-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-ansi%{_configf}-config
 
 %files -n wxX11-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univ%{_libf}_ogl-*.so
+%{_libdir}/libwx_x11univ%{_libf}_gl-*.so
 %endif
 
 %files -n wxX11-unicode
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so.*.*
-%exclude %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so.*.*
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-unicode-devel
 %defattr(644,root,root,755)
 %{_libdir}/libwx_x11univu%{_libf}_*-*.so
-%exclude %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so
 %{_libdir}/wx/config/x11univ-unicode-*
 %{_libdir}/wx/include/x11univ-unicode-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-unicode%{_configf}-config
 
 %files -n wxX11-unicode-gl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_ogl-*.so.*.*
+%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
 
 %files -n wxX11-unicode-gl-devel
 %defattr(644,root,root,755)
-%{_libdir}/libwx_x11univu%{_libf}_ogl-*.so
+%{_libdir}/libwx_x11univu%{_libf}_gl-*.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -800,6 +799,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2006/03/06 07:19:57  qboosh
+- use proper files in *-gl* packages
+
 Revision 1.44  2006/02/01 18:19:06  qboosh
 - added gcc4 patch
 
================================================================

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