rpms/vnc/devel vnc-modular-xorg.patch,1.7,1.8 vnc.spec,1.124,1.125

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	vnc-modular-xorg.patch vnc.spec 
Log Message:
* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com> 4.1.1-33
- Use VNC-provided Xregion (bug #176435).

vnc-modular-xorg.patch:
 vncinstall                           |    6 +-
 xc/programs/Xserver/vnc/Xvnc/xvnc.cc |    9 ---
 xorg-server-1.0.0/configure.ac       |    1 
 xorg-server-1.0.0/hw/Makefile.am     |    3 +
 xorg-server-1.0.0/hw/vnc/Makefile.am |   87 +++++++++++++++++++++++++++++++++++
 xorg-server-1.0.0/mi/miinitext.c     |    6 ++
 6 files changed, 102 insertions(+), 10 deletions(-)

Index: vnc-modular-xorg.patch
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vnc-modular-xorg.patch	21 Dec 2005 17:21:01 -0000	1.7
+++ vnc-modular-xorg.patch	3 Jan 2006 16:51:25 -0000	1.8
@@ -47,7 +47,8 @@
 +		libvnccommon.la \
 +		../../../../common/rfb/librfb.a \
 +		../../../../common/rdr/librdr.a \
-+		../../../../common/network/libnetwork.a
++		../../../../common/network/libnetwork.a \
++		../../../../common/Xregion/libXregion.a
 +
 +Xvnc_CFLAGS =  -DHAVE_DIX_CONFIG_H \
 +		-DNO_HW_ONLY_EXTS \
@@ -72,7 +73,8 @@
 +		libvnccommon.la \
 +		../../../../common/rfb/librfb.a \
 +		../../../../common/rdr/librdr.a \
-+		../../../../common/network/libnetwork.a
++		../../../../common/network/libnetwork.a \
++		../../../../common/Xregion/libXregion.a
 +libvnc_la_CXXFLAGS = \
 +		-I../../../../common \
 +		-I$(top_srcdir)/hw/xfree86/common \


Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- vnc.spec	3 Jan 2006 13:13:40 -0000	1.124
+++ vnc.spec	3 Jan 2006 16:51:25 -0000	1.125
@@ -5,7 +5,7 @@
 Summary:   A remote display system.
 Name:      vnc
 Version:   4.1.1
-Release: 32
+Release: 33
 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
@@ -256,7 +256,8 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
-* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com>
+* Tue Jan  3 2006 Tim Waugh <twaugh at redhat.com> 4.1.1-33
+- Use VNC-provided Xregion (bug #176435).
 - Prevent restorecon error message when not present (bug #176654).
 
 * Fri Dec 23 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-32