rpms/vnc/devel .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 vnc-modular-xorg.patch, 1.8, 1.9 vnc.spec, 1.125, 1.126
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jan 31 12:36:17 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31282
Modified Files:
.cvsignore sources vnc-modular-xorg.patch vnc.spec
Log Message:
* Tue Jan 31 2006 Tim Waugh <twaugh at redhat.com> 4.1.1-34
- Updated xorg-x11-server to 1.0.1-1.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 21 Dec 2005 15:56:26 -0000 1.16
+++ .cvsignore 31 Jan 2006 12:36:12 -0000 1.17
@@ -9,3 +9,4 @@
vnc-4_1-javasrc.tar.gz
xorg-x11-6.8.2-13.tar.bz2
xorg-server-1.0.0-2.tar.bz2
+xorg-server-1.0.1-1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 21 Dec 2005 15:56:26 -0000 1.17
+++ sources 31 Jan 2006 12:36:12 -0000 1.18
@@ -1,3 +1,3 @@
2ddf091a8be9f03bb991a553427d7b89 vnc-4_1_1-unixsrc.tar.gz
9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz
-0eb4eaba4881b18a722beb1ab697bc0f xorg-server-1.0.0-2.tar.bz2
+fff203a4550b3798aa07d8e1cf186587 xorg-server-1.0.1-1.tar.bz2
vnc-modular-xorg.patch:
vncinstall | 6 +-
xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 ---
xorg-server-1.0.1/configure.ac | 1
xorg-server-1.0.1/hw/Makefile.am | 3 +
xorg-server-1.0.1/hw/vnc/Makefile.am | 87 +++++++++++++++++++++++++++++++++++
xorg-server-1.0.1/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vnc-modular-xorg.patch 3 Jan 2006 16:51:25 -0000 1.8
+++ vnc-modular-xorg.patch 31 Jan 2006 12:36:12 -0000 1.9
@@ -1,5 +1,5 @@
---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000
@@ -0,0 +1,85 @@
+noinst_LTLIBRARIES = libvnccommon.la
+libvnccommon_la_SOURCES = \
@@ -88,8 +88,8 @@
+
+# Man page
+include $(top_srcdir)/cpprules.in
---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000
@@ -18,6 +18,8 @@
XWIN_SUBDIRS = xwin
endif
@@ -107,8 +107,8 @@
$(DMX_SUBDIRS)
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin
---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-11-28 08:16:38.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/configure.ac 2005-11-28 08:16:38.000000000 +0000
@@ -1347,6 +1347,7 @@
hw/xnest/Makefile
hw/xwin/Makefile
@@ -179,8 +179,8 @@
+if [ -f $vncModule -a -d "$moduledst" ]; then
if cmp -s $vncModule $moduledst/`basename $vncModule`; then
echo "`basename $vncModule` hasn't changed"
---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000
-+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000
+--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000
++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000
@@ -284,6 +284,9 @@
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- vnc.spec 3 Jan 2006 16:51:25 -0000 1.125
+++ vnc.spec 31 Jan 2006 12:36:12 -0000 1.126
@@ -1,11 +1,11 @@
-%define xorg_version 1.0.0-2
+%define xorg_version 1.0.1-1
%define vnc_version 4_1_1
%define java_vnc_version 4_1
Summary: A remote display system.
Name: vnc
Version: 4.1.1
-Release: 33
+Release: 34
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,6 +256,9 @@
%{_libdir}/xorg/modules/extensions/libvnc.so
%changelog
+* Tue Jan 31 2006 Tim Waugh <twaugh at redhat.com> 4.1.1-34
+- Updated xorg-x11-server to 1.0.1-1.
+
* 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).
More information about the fedora-cvs-commits
mailing list