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.8.2-system_minilzo.patch b/LibVNCServer-0.9.8.2-system_minilzo.patch deleted file mode 100644 index 5dfc436..0000000 --- a/LibVNCServer-0.9.8.2-system_minilzo.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -up LibVNCServer-0.9.8.2/configure.ac.system_minilzo LibVNCServer-0.9.8.2/configure.ac ---- LibVNCServer-0.9.8.2/configure.ac.system_minilzo 2011-11-09 05:53:25.000000000 -0600 -+++ LibVNCServer-0.9.8.2/configure.ac 2011-12-13 09:24:15.185258499 -0600 -@@ -855,7 +855,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.8.2/libvncclient/Makefile.am.system_minilzo LibVNCServer-0.9.8.2/libvncclient/Makefile.am ---- LibVNCServer-0.9.8.2/libvncclient/Makefile.am.system_minilzo 2011-10-12 11:44:49.000000000 -0500 -+++ LibVNCServer-0.9.8.2/libvncclient/Makefile.am 2011-12-13 09:25:16.923486669 -0600 -@@ -1,8 +1,9 @@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common - --libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c ../common/minilzo.c tls.c -+libvncclient_la_LIBADD=-lminilzo -+libvncclient_la_SOURCES=cursor.c listen.c rfbproto.c sockets.c vncviewer.c tls.c - --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.8.2/libvncclient/rfbproto.c.system_minilzo LibVNCServer-0.9.8.2/libvncclient/rfbproto.c ---- LibVNCServer-0.9.8.2/libvncclient/rfbproto.c.system_minilzo 2011-11-09 05:44:18.000000000 -0600 -+++ LibVNCServer-0.9.8.2/libvncclient/rfbproto.c 2011-12-13 09:24:15.186258487 -0600 -@@ -59,7 +59,7 @@ - #include - #endif - --#include "minilzo.h" -+#include - #include "tls.h" - - /* -diff -up LibVNCServer-0.9.8.2/libvncserver/Makefile.am.system_minilzo LibVNCServer-0.9.8.2/libvncserver/Makefile.am ---- LibVNCServer-0.9.8.2/libvncserver/Makefile.am.system_minilzo 2011-11-09 05:43:52.000000000 -0600 -+++ LibVNCServer-0.9.8.2/libvncserver/Makefile.am 2011-12-13 09:24:15.187258475 -0600 -@@ -19,7 +19,7 @@ include_HEADERS=../rfb/rfb.h ../rfb/rfbc - ../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h - - noinst_HEADERS=../common/d3des.h ../rfb/default8x16.h zrleoutstream.h \ -- zrlepalettehelper.h zrletypes.h private.h ../common/minilzo.h ../common/lzoconf.h ../common/lzodefs.h scale.h \ -+ zrlepalettehelper.h zrletypes.h private.h scale.h \ - $(TIGHTVNCFILETRANSFERHDRS) - - EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \ -@@ -36,10 +36,11 @@ endif - LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \ - 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) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS) - - libvncserver_la_SOURCES=$(LIB_SRCS) -+libvncserver_la_LIBADD=-lminilzo - - lib_LTLIBRARIES=libvncserver.la - -diff -up LibVNCServer-0.9.8.2/libvncserver/ultra.c.system_minilzo LibVNCServer-0.9.8.2/libvncserver/ultra.c ---- LibVNCServer-0.9.8.2/libvncserver/ultra.c.system_minilzo 2011-10-12 11:44:50.000000000 -0500 -+++ LibVNCServer-0.9.8.2/libvncserver/ultra.c 2011-12-13 09:24:15.187258475 -0600 -@@ -8,7 +8,7 @@ - */ - - #include --#include "minilzo.h" -+#include - - /* - * cl->beforeEncBuf contains pixel data in the client's format. -diff -up LibVNCServer-0.9.8.2/Makefile.am.system_minilzo LibVNCServer-0.9.8.2/Makefile.am ---- LibVNCServer-0.9.8.2/Makefile.am.system_minilzo 2011-06-09 18:14:00.000000000 -0500 -+++ LibVNCServer-0.9.8.2/Makefile.am 2011-12-13 09:24:15.187258475 -0600 -@@ -1,6 +1,6 @@ --if WITH_X11VNC --X11VNC=x11vnc --endif -+#if WITH_X11VNC -+#X11VNC=x11vnc -+#endif - - SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test $(X11VNC) - DIST_SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test 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 + #endif + +-#include "minilzo.h" ++#include + #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 +-#include "minilzo.h" ++#include + + /* + * 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-LINUX.patch b/libvncserver-LINUX.patch deleted file mode 100644 index 5c7fc52..0000000 --- a/libvncserver-LINUX.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -636,9 +636,10 @@ fi - AC_CHECK_LIB(cygipc,shmget) - AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") - - # Check if /dev/vcsa1 exists, if so, define LINUX --AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) -+dnl AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) -+AM_CONDITIONAL(LINUX, test `uname` = Linux) - - # Check for OS X specific header - AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") - AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") 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 0.9.9-1 +- 0.9.9 + * Wed Apr 18 2012 Petr Pisar 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