SPECS: xorg-driver-video-fglrx.spec - BR: OpenGL-GLU-devel for use...

[pluto]

Author: pluto                        Date: Tue Jul 11 15:34:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: OpenGL-GLU-devel for userspace.
- kill /usr/X11R6.

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.8 SPECS/xorg-driver-video-fglrx.spec:1.9
--- SPECS/xorg-driver-video-fglrx.spec:1.8	Thu May 25 14:44:04 2006
+++ SPECS/xorg-driver-video-fglrx.spec	Tue Jul 11 17:34:44 2006
@@ -49,6 +49,7 @@
 Patch2:		%{name}-kh.patch
 Patch3:		%{name}-viak8t.patch
 URL:		http://www.ati.com/support/drivers/linux/radeon-linux.html
+%{?with_userspace:BuildRequires:	OpenGL-GLU-devel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
 %{?with_userspace:BuildRequires:	qt-devel}
 BuildRequires:	rpmbuild(macros) >= 1.213
@@ -191,7 +192,6 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}}
-install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/modules/dri
 
 install common%{_bindir}/{fgl_glxgears,fglrxinfo,aticonfig} \
 	$RPM_BUILD_ROOT%{_bindir}
@@ -203,8 +203,6 @@
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libGL.so.1.* $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
 
-ln -sf %{_libdir}/xorg/modules/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/X11R6/%{_lib}/modules/dri/
-
 install common%{_includedir}/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 install common%{_prefix}/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
 %endif
@@ -244,8 +242,6 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/linux/libfglrxdrm.so
 
-%{_prefix}/X11R6
-
 # -devel
 #%attr(755,root,root) %{_libdir}/libfglrx_gamma.so
 #%{_includedir}/X11/include/libfglrx_gamma.h
@@ -275,6 +271,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/07/11 15:34:44  pluto
+- BR: OpenGL-GLU-devel for userspace.
+- kill /usr/X11R6.
+
 Revision 1.8  2006/05/25 12:44:04  wolf
 - 8.25.18
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-fglrx.spec?r1=1.8&r2=1.9&f=u