SPECS (AC-branch): wine.spec - package glut32.dll.so (BR: glut-dev...

[qboosh]

Author: qboosh                       Date: Fri May 19 07:34:41 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- package glut32.dll.so (BR: glut-devel)
- dropped xlibs bcond

---- Files affected:
SPECS:
   wine.spec (1.220.2.3 -> 1.220.2.4) 

---- Diffs:

================================================================
Index: SPECS/wine.spec
diff -u SPECS/wine.spec:1.220.2.3 SPECS/wine.spec:1.220.2.4
--- SPECS/wine.spec:1.220.2.3	Mon May 15 00:50:12 2006
+++ SPECS/wine.spec	Fri May 19 09:34:36 2006
@@ -7,7 +7,6 @@
 %bcond_without	nas		# don't build NAS mm driver
 %bcond_without	sane		# don't build TWAIN DLL with scanning support (through SANE)
 %bcond_without	cups		# without CUPS printing support in winspool,wineps DLLs
-%bcond_with	xlibs
 #
 # NOTE: wine detects the following SONAMES for dlopen at build time:
 #   libcrypto,libssl (wininet.dll)
@@ -44,17 +43,8 @@
 Patch2:		%{name}-alsa.patch
 #PatchX:		%{name}-dga.patch
 URL:		http://www.winehq.org/
-%if %{with xlibs}
-BuildRequires:	libSM-devel
-BuildRequires:	libXrandr-devel
-BuildRequires:	libXrender-devel
-BuildRequires:	libXt-devel
-BuildRequires:	libXv-devel
-%else
+BuildRequires:	OpenGL-devel
 BuildRequires:	XFree86-devel
-%endif
-BuildRequires:	XFree86-OpenGL-devel-base
-BuildRequires:	XFree86-OpenGL-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	artsc-devel}
 BuildRequires:	autoconf
@@ -68,6 +58,7 @@
 BuildRequires:	fontconfig-devel
 BuildRequires:	fontforge
 BuildRequires:	freetype-devel >= 2.0.5
+BuildRequires:	glut-devel
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtool
@@ -443,7 +434,7 @@
 %files dll-gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/wine/glu32.dll.so
-#%attr(755,root,root) %{_libdir}/wine/glut32.dll.so
+%attr(755,root,root) %{_libdir}/wine/glut32.dll.so
 %attr(755,root,root) %{_libdir}/wine/opengl32.dll.so
 
 %if %{with sane}
@@ -488,6 +479,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220.2.4  2006/05/19 07:34:36  qboosh
+- package glut32.dll.so (BR: glut-devel)
+- dropped xlibs bcond
+
 Revision 1.220.2.3  2006/05/14 22:50:12  charles
 - mv sane.ds.so to -dll-twain
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wine.spec?r1=1.220.2.3&r2=1.220.2.4&f=u