rpms/tightvnc/devel tightvnc-xorg-version.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tightvnc.spec, 1.5, 1.6 tightvnc-15-new-libtool.patch, 1.1, NONE

Wed Feb 4 17:13:14 UTC 2009

Author: atkac

Update of /cvs/pkgs/rpms/tightvnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18020

Modified Files:
	.cvsignore sources tightvnc.spec 
Added Files:
	tightvnc-xorg-version.patch 
Removed Files:
	tightvnc-15-new-libtool.patch 
Log Message:
- updated to r3586
  - X.org 1.6 support
  - non-XKB international keyboards fixes
  - tightvnc-15-new-libtool.patch merged
- added proper requirements on coreutils (#477501)


tightvnc-xorg-version.patch:

--- NEW FILE tightvnc-xorg-version.patch ---
diff -up tightvnc-1.5.0-20081120svn3200/unix/xserver/configure.ac.version tightvnc-1.5.0-20081120svn3200/unix/xserver/configure.ac
--- tightvnc-1.5.0-20081120svn3200/unix/xserver/configure.ac.version	2009-02-04 16:32:31.000000000 +0100
+++ tightvnc-1.5.0-20081120svn3200/unix/xserver/configure.ac	2009-02-04 16:32:44.000000000 +0100
@@ -1240,6 +1240,8 @@ xorg_bus_linuxpci=no
 xorg_bus_bsdpci=no
 xorg_bus_sparc=no
 
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+
 if test "x$XORG" = xyes; then
 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
@@ -1427,7 +1429,6 @@ if test "x$XORG" = xyes; then
 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
 	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
diff -up tightvnc-1.5.0-20081120svn3200/unix/xserver/hw/vnc/xf86vncModule.cc.version tightvnc-1.5.0-20081120svn3200/unix/xserver/hw/vnc/xf86vncModule.cc
--- tightvnc-1.5.0-20081120svn3200/unix/xserver/hw/vnc/xf86vncModule.cc.version	2009-02-04 16:35:06.000000000 +0100
+++ tightvnc-1.5.0-20081120svn3200/unix/xserver/hw/vnc/xf86vncModule.cc	2009-02-04 16:35:11.000000000 +0100
@@ -62,7 +62,7 @@ static XF86ModuleVersionInfo vncVersRec 
     "Constantin Kaplinsky",
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_EXTENSION,         /* needs the server extension ABI */
     ABI_EXTENSION_VERSION,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 13:07:19 -0000	1.3
+++ .cvsignore	4 Feb 2009 17:12:43 -0000	1.4
@@ -1,4 +1,4 @@
 vnc-16x16.png
 vnc-24x24.png
 vnc-48x48.png
-tightvnc-1.5.0-20081120svn3200.tar.bz2
+tightvnc-1.5.0-20090204svn3586.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Nov 2008 13:07:19 -0000	1.3
+++ sources	4 Feb 2009 17:12:43 -0000	1.4
@@ -1,4 +1,4 @@
 2f19f562d4ff6b8752c1686331ce44b7  vnc-16x16.png
 273f51f58324f12e2cc96e2a1dcc5a6d  vnc-24x24.png
 f96d936a0fcc61cabee0e6cb65e0e38a  vnc-48x48.png
-5a5f6ab8bf11162025575e755b600158  tightvnc-1.5.0-20081120svn3200.tar.bz2
+2cc65908b7597e27be3b92acc50b08b6  tightvnc-1.5.0-20090204svn3586.tar.bz2


Index: tightvnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/tightvnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tightvnc.spec	18 Jan 2009 13:23:26 -0000	1.5
+++ tightvnc.spec	4 Feb 2009 17:12:43 -0000	1.6
@@ -1,10 +1,10 @@
-%define		revision	3200
-%define		date		20081120
+%define		revision	3586
+%define		date		20090204
 %define		releasetag	%{date}svn%{revision}
 
 Name:		tightvnc
 Version:	1.5.0
-Release:	0.10.%{releasetag}%{?dist}
+Release:	0.11.%{releasetag}%{?dist}
 Summary:	A TightVNC remote display system
 
 Group:		User Interface/Desktops
@@ -36,6 +36,9 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	desktop-file-utils
 
+Requires(post):	coreutils	
+Requires(postun):coreutils	
+
 Provides:	vnc = 4.1.2-36, vnc-libs = 4.1.2-36
 Obsoletes:	vnc < 4.1.2-36, vnc-libs < 4.1.2-36
 
@@ -48,7 +51,7 @@
 Patch6:		tightvnc-newfbsize.patch
 Patch7:		tightvnc-rh212985.patch
 Patch8:		tightvnc-viewer-reparent.patch
-Patch9:		tightvnc-15-new-libtool.patch
+Patch9:		tightvnc-xorg-version.patch 
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -87,16 +90,16 @@
 %prep
 %setup -q -n %{name}-%{version}-%{releasetag}
 
-%patch9 -p1 -b .new-libtool
-
 cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
-patch -p1 -b -fuzz=0 --suffix .vnc < ../xserver.patch
+patch -p1 --fuzz=0 < ../xserver16.patch
 popd
 
+%patch9 -p1 -b .version
+
 %patch0 -p1 -b .102434
 %patch1 -p1 -b .bounds
 %patch2 -p1 -b .xclients
@@ -238,6 +241,13 @@
 %{_libdir}/xorg/modules/extensions/libvnc.so
 
 %changelog
+* Wed Feb 04 2009 Adam Tkac <atkac redhat com> 1.5.0-0.11.20090204svn3586
+- updated to r3586
+  - X.org 1.6 support
+  - non-XKB international keyboards fixes
+  - tightvnc-15-new-libtool.patch merged
+- added proper requirements on coreutils (#477501)
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz at redhat.com> 1.5.0-0.10.20081120svn3200
 - rebuild with new openssl
 


--- tightvnc-15-new-libtool.patch DELETED ---


