rpms/mesa/devel mesa-7.1-dri-driver-dir.patch, NONE, 1.1 mesa.spec, 1.145, 1.146

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24689

Modified Files:
	mesa.spec 
Added Files:
	mesa-7.1-dri-driver-dir.patch 
Log Message:
* Wed Nov 07 2007 Dave Airlie <airlied at redhat.com> 7.1-0.2
- fix DRI driver directory


mesa-7.1-dri-driver-dir.patch:

--- NEW FILE mesa-7.1-dri-driver-dir.patch ---
diff -up Mesa-7.1pre/configs/default.da Mesa-7.1pre/configs/default
--- Mesa-7.1pre/configs/default.da	2007-11-07 08:44:17.000000000 +1000
+++ Mesa-7.1pre/configs/default	2007-11-07 08:44:28.000000000 +1000
@@ -82,7 +82,7 @@ APP_LIB_DEPS = -lm
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+DRI_DRIVER_INSTALL_DIR = $(DRI_DRIVER_DIR)
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- mesa.spec	1 Nov 2007 14:11:28 -0000	1.145
+++ mesa.spec	6 Nov 2007 23:15:32 -0000	1.146
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -44,11 +44,11 @@
 
 Patch1: mesa-7.1-kill-glw.patch
 Patch2: mesa-7.1pre-osmesa-version.patch
+Patch3: mesa-7.1-dri-driver-dir.patch
 Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
 Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
 Patch18: mesa-7.0-selinux-awareness.patch
 Patch25: mesa-7.0-symlinks-before-depend.patch
-
 BuildRequires: pkgconfig
 %if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.0-0
@@ -171,6 +171,7 @@
 
 %patch1 -p1 -b .kill-glw
 %patch2 -p1 -b .osmesa-version
+%patch3 -p1 -b .dri-driver-dir
 %patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
 %patch5 -p1 -b .xserver-1.1-compat
 %patch18 -p1 -b .selinux-awareness
@@ -405,6 +406,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Wed Nov 07 2007 Dave Airlie <airlied at redhat.com> 7.1-0.2
+- fix DRI driver directory
+
 * Thu Nov 01 2007 Adam Jackson <ajax at redhat.com> 7.1-0.1
 - Fix EVR, 7.1pre > 7.1, that would have been bad.
 - Fix %%setup to match.