Author: qboosh Date: Thu Apr 21 17:49:03 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 0.9.8 - updated linux patch
---- Files affected: packages/libvncserver: libvncserver-linux.patch (1.3 -> 1.4) , libvncserver.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: packages/libvncserver/libvncserver-linux.patch diff -u packages/libvncserver/libvncserver-linux.patch:1.3 packages/libvncserver/libvncserver-linux.patch:1.4 --- packages/libvncserver/libvncserver-linux.patch:1.3 Sat Jul 11 23:30:55 2009 +++ packages/libvncserver/libvncserver-linux.patch Thu Apr 21 19:48:58 2011 @@ -1,15 +1,15 @@ ---- LibVNCServer-0.9.1/configure.ac.orig 2007-05-27 17:14:22.000000000 +0200 -+++ LibVNCServer-0.9.1/configure.ac 2007-06-02 00:13:55.826402162 +0200 +--- LibVNCServer-0.9.8/configure.ac.orig 2011-03-29 13:58:56.000000000 +0200 ++++ LibVNCServer-0.9.8/configure.ac 2011-04-21 19:24:48.099385243 +0200 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. - AC_INIT(LibVNCServer, 0.9.7, http://sourceforge.net/projects/libvncserver) - AM_INIT_AUTOMAKE(LibVNCServer, 0.9.7) + AC_INIT(LibVNCServer, 0.9.8, http://sourceforge.net/projects/libvncserver) + AM_INIT_AUTOMAKE(LibVNCServer, 0.9.8) -AM_CONFIG_HEADER(rfbconfig.h) +AC_CONFIG_HEADER(rfbconfig.h) AX_PREFIX_CONFIG_H([rfb/rfbconfig.h]) # Checks for programs. -@@ -617,8 +617,8 @@ +@@ -781,8 +781,8 @@ AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_FUNC_FORK @@ -20,7 +20,7 @@ uname_s=`(uname -s) 2>/dev/null` if test "x$uname_s" = "xHP-UX"; then -@@ -637,7 +637,7 @@ +@@ -801,7 +801,7 @@ AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") # Check if /dev/vcsa1 exists, if so, define LINUX @@ -29,4 +29,3 @@ # Check for OS X specific header AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") - ================================================================ Index: packages/libvncserver/libvncserver.spec diff -u packages/libvncserver/libvncserver.spec:1.20 packages/libvncserver/libvncserver.spec:1.21 --- packages/libvncserver/libvncserver.spec:1.20 Thu Nov 18 07:16:27 2010 +++ packages/libvncserver/libvncserver.spec Thu Apr 21 19:48:58 2011 @@ -1,21 +1,25 @@ # $Revision$, $Date$ -%define _packname LibVNCServer +%define srcname LibVNCServer Summary: LibVNCServer - a for easy implementation of VNC/RDP server Summary(pl.UTF-8): LibVNCServer - biblioteka do łatwego implementowania serwera VNC/RDP Name: libvncserver -Version: 0.9.7 -Release: 3 +Version: 0.9.8 +Release: 1 Epoch: 0 License: GPL v2 Group: Libraries -Source0: http://dl.sourceforge.net/libvncserver/%{_packname}-%{version}.tar.gz -# Source0-md5: 14af5bdae461df4666c18e5f83c150c4 +Source0: http://downloads.sourceforge.net/libvncserver/%{srcname}-%{version}.tar.gz +# Source0-md5: dda9e75a1d5d7c37bb57d90ead7b32b3 Patch0: %{name}-linux.patch URL: http://libvncserver.sourceforge.net/ BuildRequires: autoconf >= 2.50 BuildRequires: automake +BuildRequires: gnutls-devel >= 2.4.0 +BuildRequires: libgcrypt-devel >= 1.4.0 BuildRequires: libjpeg-devel BuildRequires: libtool +BuildRequires: sed >= 4.0 +BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXdamage-devel BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXfixes-devel @@ -28,6 +32,8 @@ # for noinst client_examples only #BuildRequires: SDL-devel #BuildRequires: ffmpeg-devel +Requires: gnutls >= 2.4.0 +Requires: libgcrypt >= 1.4.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -62,6 +68,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe LibVNCServer Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: gnutls-devel >= 2.4.0 +Requires: libgcrypt-devel >= 1.4.0 Requires: libjpeg-devel Requires: zlib-devel @@ -96,7 +104,7 @@ Przykładowe programy wykorzystujące LibVNCServer. %prep -%setup -q -n %{_packname}-%{version} +%setup -q -n %{srcname}-%{version} %patch0 -p1 install -d x11vnc/misc @@ -105,6 +113,8 @@ awk 'BEGIN { f=1; } /# libtool.m4/ { f=0; } { if (f) { print $0; } }' acinclude.m4 > acinclude.m4.new mv acinclude.m4.new acinclude.m4 +sed -i -e '/AC_CONFIG_FILES.*x11vnc/d' configure.ac + %build %{__libtoolize} %{__aclocal} @@ -121,6 +131,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# *.la not removed - *.pc don't contain Requires.private nor Libs.private + %clean rm -rf $RPM_BUILD_ROOT @@ -143,6 +155,8 @@ %{_libdir}/libvncclient.la %{_libdir}/libvncserver.la %{_includedir}/rfb +%{_pkgconfigdir}/libvncclient.pc +%{_pkgconfigdir}/libvncserver.pc %files static %defattr(644,root,root,755) @@ -159,6 +173,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2011/04/21 17:48:58 qboosh +- updated to 0.9.8 +- updated linux patch + Revision 1.20 2010/11/18 06:16:27 qboosh - verbose files, ghost soname symlinks ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvncserver/libvncserver-linux.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvncserver/libvncserver.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
