rpms
/
libvncserver
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.9.8.2 (#694975)

Browse Source 
new %check section (yay for xvfb-run)
epel9
Rex Dieter 13 years ago
parent f9bdaaf4dd
commit de4dfee1aa
5 changed files with 35 additions and 135 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape View File

@ -1 +1,2 @@
LibVNCServer-0.9.7-clean.tar.xz
/LibVNCServer-0.9.7-clean.tar.xz
/LibVNCServer-0.9.8.2.tar.gz

11
libvncserver-0.9.1-close_server_socket.patch
Unescape View File

@ -1,11 +0,0 @@
diff -up LibVNCServer-0.9.1/libvncclient/vncviewer.c~ LibVNCServer-0.9.1/libvncclient/vncviewer.c
--- LibVNCServer-0.9.1/libvncclient/vncviewer.c~ 2007-02-01 17:05:56.000000000 +0200
+++ LibVNCServer-0.9.1/libvncclient/vncviewer.c 2009-05-20 22:26:35.000000000 +0300
@@ -316,6 +316,7 @@ void rfbClientCleanup(rfbClient* client)
#endif
#endif
+ if (client->sock > 0) close(client->sock);
free(client->desktopName);
free(client->serverHost);
free(client);

99
libvncserver-0.9.7-system_minilzo.patch
Unescape View File

@ -1,99 +0,0 @@
diff -up LibVNCServer-0.9.7/libvncclient/Makefile.in.orig LibVNCServer-0.9.7/libvncclient/Makefile.in
--- LibVNCServer-0.9.7/libvncclient/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600
+++ LibVNCServer-0.9.7/libvncclient/Makefile.in 2009-05-04 12:33:14.513826561 -0500
@@ -61,7 +61,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libvncclient_la_LIBADD =
am_libvncclient_la_OBJECTS = cursor.lo listen.lo rfbproto.lo \
- sockets.lo vncviewer.lo minilzo.lo
+ sockets.lo vncviewer.lo
libvncclient_la_OBJECTS = $(am_libvncclient_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -222,8 +222,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
with_ffmpeg = @with_ffmpeg@
AM_CFLAGS = -g -I $(top_srcdir) -I. -Wall
-libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c minilzo.c
-noinst_HEADERS = lzoconf.h minilzo.h
+libvncclient_la_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c
+noinst_HEADERS = lzoconf.h
EXTRA_DIST = corre.c hextile.c rre.c tight.c zlib.c zrle.c ultra.c
lib_LTLIBRARIES = libvncclient.la
all: all-am
@@ -297,7 +297,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minilzo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbproto.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vncviewer.Plo@am__quote@
diff -up LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig LibVNCServer-0.9.7/libvncclient/rfbproto.c
--- LibVNCServer-0.9.7/libvncclient/rfbproto.c.orig 2008-02-04 11:58:11.000000000 -0600
+++ LibVNCServer-0.9.7/libvncclient/rfbproto.c 2009-05-04 12:33:14.514826549 -0500
@@ -50,7 +50,7 @@
#include <stdarg.h>
#include <time.h>
-#include "minilzo.h"
+#include <minilzo.h>
/*
* rfbClientLog prints a time-stamped message to the log file (stderr).
diff -up LibVNCServer-0.9.7/libvncserver/Makefile.in.orig LibVNCServer-0.9.7/libvncserver/Makefile.in
--- LibVNCServer-0.9.7/libvncserver/Makefile.in.orig 2009-01-11 20:53:13.000000000 -0600
+++ LibVNCServer-0.9.7/libvncserver/Makefile.in 2009-05-04 12:40:31.533854737 -0500
@@ -63,7 +63,7 @@ libvncserver_la_LIBADD =
am__libvncserver_la_SOURCES_DIST = 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 d3des.c \
- vncauth.c cargs.c minilzo.c ultra.c scale.c zlib.c zrle.c \
+ vncauth.c cargs.c ultra.c scale.c zlib.c zrle.c \
zrleoutstream.c zrlepalettehelper.c zywrletemplate.c tight.c \
tightvnc-filetransfer/rfbtightserver.c \
tightvnc-filetransfer/handlefiletransferrequest.c \
@@ -79,7 +79,7 @@ am__libvncserver_la_SOURCES_DIST = main.
am__objects_4 = main.lo rfbserver.lo rfbregion.lo auth.lo sockets.lo \
stats.lo corre.lo hextile.lo rre.lo translate.lo cutpaste.lo \
httpd.lo cursor.lo font.lo draw.lo selbox.lo d3des.lo \
- vncauth.lo cargs.lo minilzo.lo ultra.lo scale.lo \
+ vncauth.lo cargs.lo ultra.lo scale.lo \
$(am__objects_1) $(am__objects_2) $(am__objects_3)
am_libvncserver_la_OBJECTS = $(am__objects_4)
libvncserver_la_OBJECTS = $(am_libvncserver_la_OBJECTS)
@@ -98,7 +98,7 @@ SOURCES = $(libvncserver_la_SOURCES)
DIST_SOURCES = $(am__libvncserver_la_SOURCES_DIST)
includeHEADERS_INSTALL = $(INSTALL_HEADER)
am__noinst_HEADERS_DIST = d3des.h ../rfb/default8x16.h zrleoutstream.h \
- zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h \
+ zrlepalettehelper.h zrletypes.h private.h lzoconf.h \
scale.h tightvnc-filetransfer/filelistinfo.h \
tightvnc-filetransfer/filetransfermsg.h \
tightvnc-filetransfer/handlefiletransferrequest.h \
@@ -264,7 +264,7 @@ include_HEADERS = ../rfb/rfb.h ../rfb/rf
../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h
noinst_HEADERS = d3des.h ../rfb/default8x16.h zrleoutstream.h \
- zrlepalettehelper.h zrletypes.h private.h minilzo.h lzoconf.h scale.h \
+ zrlepalettehelper.h zrletypes.h private.h lzoconf.h scale.h \
$(TIGHTVNCFILETRANSFERHDRS)
EXTRA_DIST = tableinit24.c tableinittctemplate.c tabletranstemplate.c \
@@ -276,7 +276,7 @@ EXTRA_DIST = tableinit24.c tableinittcte
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 d3des.c vncauth.c cargs.c minilzo.c ultra.c scale.c \
+ draw.c selbox.c d3des.c vncauth.c cargs.c ultra.c scale.c \
$(ZLIBSRCS) $(JPEGSRCS) $(TIGHTVNCFILETRANSFERSRCS)
libvncserver_la_SOURCES = $(LIB_SRCS)
@@ -364,7 +364,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextile.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minilzo.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbregion.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbserver.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbtightserver.Plo@am__quote@

55
libvncserver.spec
Unescape View File

@ -7,34 +7,32 @@
Summary: Library to make writing a vnc server easy
Name: libvncserver
Version: 0.9.7
Release: 5%{?dist}
Version: 0.9.8.2
Release: 1%{?dist}
# NOTE: --with-tightvnc-filetransfer => GPLv2
License: GPLv2+
Group: System Environment/Libraries
URL: http://libvncserver.sourceforge.net/
# This source is made from
# http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
# by deleting all .jar files.
Source0: LibVNCServer-%{version}-clean.tar.xz
Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: libvncserver-0.9.7-system_minilzo.patch
Patch1: LibVNCServer-0.9.8.2-system_minilzo.patch
Patch2: libvncserver-0.9.1-multilib.patch
# safer LINUX platform detection (from opensuse)
Patch50: libvncserver-LINUX.patch
## upstream patches
Patch100: libvncserver-0.9.1-close_server_socket.patch
# upstream name
Obsoletes: LibVNCServer < 0.9.1
Provides: LibVNCServer = %{version}-%{release}
BuildRequires: automake autoconf
BuildRequires: libjpeg-devel
BuildRequires: zlib-devel
%{?system_minilzo:BuildRequires: lzo-minilzo lzo-devel}
BuildRequires: pkgconfig(gnutls)
# for %%check
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: zlib-devel
%description
LibVNCServer makes writing a VNC server (or more correctly, a program
@ -46,7 +44,7 @@ compression schemata.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
# libvncserver-config deps
Requires: coreutils
# upstream name
@ -62,20 +60,21 @@ Provides: LibVNCServer-devel = %{version}-%{release}
%if 0%{?system_minilzo}
%patch1 -p1 -b .system_minilzo
#nuke bundled minilzo
find . -name minilzo\* -exec rm -f {} \;
rm -f common/lzodefs.h common/lzoconf.h commmon/minilzo.h common/minilzo.c
%endif
%patch2 -p1 -b .multilib
%patch50 -p0 -b .LINUX
%patch100 -p1 -b .close_server_socket
# fix encoding
mv AUTHORS AUTHORS.OLD && \
iconv -f ISO_8859-1 -t UTF8 AUTHORS.OLD > AUTHORS && \
touch --reference AUTHORS.OLD AUTHORS
for file in AUTHORS ChangeLog ; do
mv ${file} ${file}.OLD && \
iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \
touch --reference ${file}.OLD $file
done
# fix source perms
find -name "*.c" -o -name "*.h" | xargs chmod 644
# needed by patches 1, 50
autoreconf
%build
@ -86,7 +85,7 @@ find -name "*.c" -o -name "*.h" | xargs chmod 644
# hack to omit unused-direct-shlib-dependencies
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags} %{?system_minilzo:CFLAGS="$RPM_OPT_FLAGS -I %{_includedir}/lzo" LDFLAGS="$LDFLAGS -lminilzo"}
make %{?_smp_mflags}
%install
@ -100,15 +99,19 @@ rm -f %{buildroot}%{_libdir}/lib*.a
rm -f %{buildroot}%{_libdir}/lib*.la
%check
unset DISPLAY
# Run a fake X session
xvfb-run -a make -C test test
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
@ -117,13 +120,19 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
%{_bindir}/*-config
%{_bindir}/libvncserver-config
%{_includedir}/rfb/
%{_libdir}/libvncclient.so
%{_libdir}/libvncserver.so
%{_libdir}/pkgconfig/libvncclient.pc
%{_libdir}/pkgconfig/libvncserver.pc
%changelog
* Tue Dec 13 2011 Rex Dieter <rdieter@fedoraproject.org> 0.9.8.2-1
- 0.9.8.2 (#694975)
- new %%check section (yay for xvfb-run)
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

2
sources
Unescape View File

@ -1 +1 @@
ad6811d32e275df89b3dbcf491d4f3f5 LibVNCServer-0.9.7-clean.tar.xz
dfed1dcc25cb338c7fdbcda2c3df7f50 LibVNCServer-0.9.8.2.tar.gz

Write Preview
Loading…
Cancel
Save