rpms/mesa/devel mesa-7.0-selinux-awareness.patch, 1.2, 1.3 mesa.spec, 1.150, 1.151

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	mesa-7.0-selinux-awareness.patch mesa.spec 
Log Message:

Fix libOSMesa* to link against libselinux


mesa-7.0-selinux-awareness.patch:

Index: mesa-7.0-selinux-awareness.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.0-selinux-awareness.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-7.0-selinux-awareness.patch	1 Nov 2007 06:55:38 -0000	1.2
+++ mesa-7.0-selinux-awareness.patch	15 Nov 2007 20:59:12 -0000	1.3
@@ -132,15 +132,36 @@
  GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
  		-lm -lpthread -ldl \
                  $(LIBDRM_LIB)
-diff -up Mesa-7.1pre/progs/osdemos/Makefile.da Mesa-7.1pre/progs/osdemos/Makefile
---- Mesa-7.1pre/progs/osdemos/Makefile.da	2007-11-01 15:59:52.000000000 +1000
-+++ Mesa-7.1pre/progs/osdemos/Makefile	2007-11-01 15:59:57.000000000 +1000
-@@ -5,7 +5,7 @@ include $(TOP)/configs/current
+diff -up Mesa-7.1pre/configs/linux-osmesa16.BAD Mesa-7.1pre/configs/linux-osmesa16
+--- Mesa-7.1pre/configs/linux-osmesa16.BAD	2007-11-15 14:56:18.000000000 -0500
++++ Mesa-7.1pre/configs/linux-osmesa16	2007-11-15 14:56:35.000000000 -0500
+@@ -26,6 +26,6 @@ PROGRAM_DIRS = 
  
- INCDIR = $(TOP)/include
  
--OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS)
-+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lOSMesa $(APP_LIB_DEPS) -l selinux
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa16
+diff -up Mesa-7.1pre/configs/linux-osmesa32.BAD Mesa-7.1pre/configs/linux-osmesa32
+--- Mesa-7.1pre/configs/linux-osmesa32.BAD	2007-11-15 14:55:35.000000000 -0500
++++ Mesa-7.1pre/configs/linux-osmesa32	2007-11-15 14:55:44.000000000 -0500
+@@ -26,6 +26,6 @@ PROGRAM_DIRS = 
  
- OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
  
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa32
+diff -up Mesa-7.1pre/configs/linux-osmesa.BAD Mesa-7.1pre/configs/linux-osmesa
+--- Mesa-7.1pre/configs/linux-osmesa.BAD	2007-11-15 15:00:23.000000000 -0500
++++ Mesa-7.1pre/configs/linux-osmesa	2007-11-15 15:00:28.000000000 -0500
+@@ -23,6 +23,6 @@ PROGRAM_DIRS = osdemos
+ 
+ 
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa -lGLU


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- mesa.spec	12 Nov 2007 18:44:13 -0000	1.150
+++ mesa.spec	15 Nov 2007 20:59:12 -0000	1.151
@@ -32,7 +32,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -404,6 +404,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Thu Nov 15 2007 Tom "spot" Callaway <tcallawa at redhat.com> 7.1-0.4
+- link libOSMesa* against libselinux
+
 * Mon Nov 12 2007 Adam Jackson <ajax at redhat.com> 7.1-0.3
 - Drop xserver 1.1 source compatibility.