rpms/vnc/devel vnc-mesa-6.5.2.patch,NONE,1.1 vnc.spec,1.160,1.161

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4295/vnc/devel

Modified Files:
	vnc.spec 
Added Files:
	vnc-mesa-6.5.2.patch 
Log Message:
fixed building against mesa-6.5.2


vnc-mesa-6.5.2.patch:
 Makefile.am |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE vnc-mesa-6.5.2.patch ---
--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/main/Makefile.am.mesa-652	2006-12-11 13:14:24.000000000 +0100
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.1/GL/mesa/main/Makefile.am	2006-12-11 13:14:36.000000000 +0100
@@ -8,6 +8,7 @@
 	@GLX_DEFINES@
 
 INCLUDES = -I at MESA_SOURCE@/include \
+           -I at MESA_SOURCE@/src/main \
            -I../X \
            -I../array_cache \
            -I../glapi \


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- vnc.spec	5 Dec 2006 14:48:50 -0000	1.160
+++ vnc.spec	11 Dec 2006 12:18:24 -0000	1.161
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.2
-Release:   7.2%{?dist}
+Release:   8%{?dist}
 URL:       http://www.realvnc.com
 Source0:   http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz
 Source1:   http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz
@@ -44,6 +44,7 @@
 Patch26:   vnc-mesa.patch
 Patch27:   vnc-selinux.patch
 Patch28:   vnc-render.patch
+Patch29:   vnc-mesa-6.5.2.patch
 License:   GPL
 Group:     User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -128,6 +129,7 @@
 %patch26 -p0 -b .mesa
 %patch27 -p0 -b .selinux
 %patch28 -p1 -b .render
+%patch29 -p1 -b .mesa-652
 
 cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
 	unix/xc/programs/Xserver/Xvnc.man \
@@ -293,6 +295,9 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Mon Dec 11 2006 Adam Tkac <atkac redhat com> 4.1.2-8.fc7
+- fixed building against mesa-6.5.2
+
 * Tue Dec 05 2006 Adam Tkac <atkac redhat com> 4.1.2-7.2.fc7
 - fixed vnc-102434.patch - potential buffer overflow error
 - only ppc64 architecture has enabled render extensions