[libvncserver] 0.9.9

Tue May 8 15:21:38 UTC 2012

commit dd9b15a6e37595f1417ec072a6d86510a6bcbb98
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue May 8 10:24:04 2012 -0500

    0.9.9

 .gitignore                                |    2 +-
 LibVNCServer-0.9.8.2-system_minilzo.patch |   89 ----------------------------
 LibVNCServer-0.9.9-system_minilzo.patch   |   92 +++++++++++++++++++++++++++++
 libvncserver-LINUX.patch                  |   16 -----
 libvncserver.spec                         |   21 +++----
 sources                                   |    2 +-
 6 files changed, 104 insertions(+), 118 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3cbe231..76ae855 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/LibVNCServer-0.9.7-clean.tar.xz
 /LibVNCServer-0.9.8.2.tar.gz
+/LibVNCServer-0.9.9.tar.gz
diff --git a/LibVNCServer-0.9.9-system_minilzo.patch b/LibVNCServer-0.9.9-system_minilzo.patch
new file mode 100644
index 0000000..c0c29b1
--- /dev/null
+++ b/LibVNCServer-0.9.9-system_minilzo.patch
@@ -0,0 +1,92 @@
+diff -up LibVNCServer-0.9.9/configure.ac.system_minilzo LibVNCServer-0.9.9/configure.ac
+--- LibVNCServer-0.9.9/configure.ac.system_minilzo	2012-05-04 11:27:08.000000000 -0500
++++ LibVNCServer-0.9.9/configure.ac	2012-05-07 08:22:19.473583597 -0500
+@@ -992,7 +992,7 @@ if test "$build_x11vnc" = "yes"; then
+ 	#
+ 	# configure.ac:690: required file `x11vnc/Makefile.in' not found
+ 	#
+-	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
++	#AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
+ 
+ 	if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
+ 		# need to move local tarball rfb headers aside:
+diff -up LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncclient/Makefile.am
+--- LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/libvncclient/Makefile.am	2012-05-07 08:22:19.474583585 -0500
+@@ -13,10 +13,10 @@ endif
+ endif
+ 
+ 
+-libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c $(TLSSRCS)
+-libvncclient_la_LIBADD=$(TLSLIBS)
++libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c $(TLSSRCS)
++libvncclient_la_LIBADD=$(TLSLIBS) -lminilzo
+ 
+-noinst_HEADERS=../common/lzodefs.h ../common/lzoconf.h ../common/minilzo.h tls.h
++noinst_HEADERS=tls.h
+ 
+ rfbproto.o: rfbproto.c corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c
+ 
+diff -up LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo LibVNCServer-0.9.9/libvncclient/rfbproto.c
+--- LibVNCServer-0.9.9/libvncclient/rfbproto.c.system_minilzo	2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/libvncclient/rfbproto.c	2012-05-07 08:22:19.474583585 -0500
+@@ -59,7 +59,7 @@
+ #include <gcrypt.h>
+ #endif
+ 
+-#include "minilzo.h"
++#include <lzo/minilzo.h>
+ #include "tls.h"
+ 
+ /*
+diff -up LibVNCServer-0.9.9/libvncserver/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncserver/Makefile.am
+--- LibVNCServer-0.9.9/libvncserver/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/libvncserver/Makefile.am	2012-05-07 08:31:01.342059345 -0500
+@@ -37,7 +37,7 @@ include_HEADERS=../rfb/rfb.h ../rfb/rfbc
+ 
+ noinst_HEADERS=../common/d3des.h ../rfb/default8x16.h zrleoutstream.h \
+ 	zrlepalettehelper.h zrletypes.h private.h scale.h rfbssl.h rfbcrypto.h \
+-	../common/minilzo.h ../common/lzoconf.h ../common/lzodefs.h ../common/md5.h ../common/sha1.h \
++	../common/md5.h ../common/sha1.h \
+ 	$(TIGHTVNCFILETRANSFERHDRS)
+ 
+ EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \
+@@ -54,11 +54,11 @@ endif
+ LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c $(WEBSOCKETSSRCS) \
+ 	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
+ 	httpd.c cursor.c font.c \
+-	draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ../common/minilzo.c ultra.c scale.c \
++	draw.c selbox.c ../common/d3des.c ../common/vncauth.c cargs.c ultra.c scale.c \
+ 	$(ZLIBSRCS) $(TIGHTSRCS) $(TIGHTVNCFILETRANSFERSRCS)
+ 
+ libvncserver_la_SOURCES=$(LIB_SRCS)
+-libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS)
++libvncserver_la_LIBADD=$(WEBSOCKETSSSLLIBS) -lminilzo
+ 
+ lib_LTLIBRARIES=libvncserver.la
+ 
+diff -up LibVNCServer-0.9.9/libvncserver/ultra.c.system_minilzo LibVNCServer-0.9.9/libvncserver/ultra.c
+--- LibVNCServer-0.9.9/libvncserver/ultra.c.system_minilzo	2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/libvncserver/ultra.c	2012-05-07 08:22:19.475583573 -0500
+@@ -8,7 +8,7 @@
+  */
+ 
+ #include <rfb/rfb.h>
+-#include "minilzo.h"
++#include <lzo/minilzo.h>
+ 
+ /*
+  * cl->beforeEncBuf contains pixel data in the client's format.
+diff -up LibVNCServer-0.9.9/Makefile.am.system_minilzo LibVNCServer-0.9.9/Makefile.am
+--- LibVNCServer-0.9.9/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/Makefile.am	2012-05-07 08:22:19.475583573 -0500
+@@ -1,6 +1,6 @@
+-if WITH_X11VNC
+-X11VNC=x11vnc
+-endif
++#if WITH_X11VNC
++#X11VNC=x11vnc
++#endif
+ 
+ SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test $(X11VNC)
+ DIST_SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test
diff --git a/libvncserver.spec b/libvncserver.spec
index ad3a5e5..f0c24cd 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -7,8 +7,8 @@
 
 Summary: Library to make writing a vnc server easy
 Name:    libvncserver
-Version: 0.9.8.2
-Release: 4%{?dist}
+Version: 0.9.9
+Release: 1%{?dist}
 # NOTE: --with-tightvnc-filetransfer => GPLv2
 License: GPLv2+
 Group:   System Environment/Libraries
@@ -16,12 +16,9 @@ URL:     http://libvncserver.sourceforge.net/
 Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: LibVNCServer-0.9.8.2-system_minilzo.patch
+Patch1: LibVNCServer-0.9.9-system_minilzo.patch
 Patch2: libvncserver-0.9.1-multilib.patch
 
-# safer LINUX platform detection (from opensuse)
-Patch50:  libvncserver-LINUX.patch
-
 # upstream name
 Obsoletes: LibVNCServer < 0.9.1
 Provides:  LibVNCServer = %{version}-%{release}
@@ -65,7 +62,6 @@ rm -f common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
 %endif
 
 %patch2 -p1 -b .multilib
-%patch50 -p0 -b .LINUX
 
 # fix encoding
 for file in AUTHORS ChangeLog ; do
@@ -86,7 +82,7 @@ autoreconf
 # hack to omit unused-direct-shlib-dependencies
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 
 %install
@@ -95,9 +91,9 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # unpackaged files
-rm -f %{buildroot}%{_bindir}/LinuxVNC
-rm -f %{buildroot}%{_libdir}/lib*.a
-rm -f %{buildroot}%{_libdir}/lib*.la
+rm -fv %{buildroot}%{_bindir}/linuxvnc
+rm -fv %{buildroot}%{_libdir}/lib*.a
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
 %check
@@ -130,6 +126,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 07 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.9-1
+- 0.9.9
+
 * Wed Apr 18 2012 Petr Pisar <ppisar at redhat.com> 0.9.8.2-4
 - Enable system lzo library on rhel >= 6 (#813764)
 
diff --git a/sources b/sources
index 73c0d8e..2564e4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dfed1dcc25cb338c7fdbcda2c3df7f50  LibVNCServer-0.9.8.2.tar.gz
+70422169b122765693d2a294d13e3714  LibVNCServer-0.9.9.tar.gz
