packages: libvncserver/libvncserver-linux.patch, libvncserver/libvncserver....

[arekm]

Author: arekm                        Date: Sat Jul 11 21:31:01 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9.7

---- Files affected:
packages/libvncserver:
   libvncserver-linux.patch (1.2 -> 1.3) , libvncserver.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/libvncserver/libvncserver-linux.patch
diff -u packages/libvncserver/libvncserver-linux.patch:1.2 packages/libvncserver/libvncserver-linux.patch:1.3
--- packages/libvncserver/libvncserver-linux.patch:1.2	Sat Jun  2 01:38:04 2007
+++ packages/libvncserver/libvncserver-linux.patch	Sat Jul 11 23:30:55 2009
@@ -2,8 +2,8 @@
 +++ LibVNCServer-0.9.1/configure.ac	2007-06-02 00:13:55.826402162 +0200
 @@ -1,7 +1,7 @@
  # Process this file with autoconf to produce a configure script.
- AC_INIT(LibVNCServer, 0.9.1, http://sourceforge.net/projects/libvncserver)
- AM_INIT_AUTOMAKE(LibVNCServer, 0.9.1)
+ AC_INIT(LibVNCServer, 0.9.7, http://sourceforge.net/projects/libvncserver)
+ AM_INIT_AUTOMAKE(LibVNCServer, 0.9.7)
 -AM_CONFIG_HEADER(rfbconfig.h)
 +AC_CONFIG_HEADER(rfbconfig.h)
  AX_PREFIX_CONFIG_H([rfb/rfbconfig.h])
@@ -29,14 +29,4 @@
  
  # Check for OS X specific header
  AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true")
-@@ -675,10 +675,6 @@
- 	test/Makefile
- 	libvncserver-config
- 	LibVNCServer.spec])
--# x11vnc only:
--if test "$build_x11vnc" = "yes"; then
--	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile])
--fi
- 
- AC_CONFIG_COMMANDS([chmod-libvncserver-config],[chmod a+x libvncserver-config])
- AC_OUTPUT
+

================================================================
Index: packages/libvncserver/libvncserver.spec
diff -u packages/libvncserver/libvncserver.spec:1.15 packages/libvncserver/libvncserver.spec:1.16
--- packages/libvncserver/libvncserver.spec:1.15	Sat Jul 11 21:55:53 2009
+++ packages/libvncserver/libvncserver.spec	Sat Jul 11 23:30:55 2009
@@ -3,13 +3,13 @@
 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.1
-Release:	2
+Version:	0.9.7
+Release:	1
 Epoch:		0
 License:	GPL v2
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/libvncserver/%{_packname}-%{version}.tar.gz
-# Source0-md5:	aa00efc3dabde82fde9509bfbab0aba4
+# Source0-md5:	14af5bdae461df4666c18e5f83c150c4
 Patch0:		%{name}-linux.patch
 URL:		http://libvncserver.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
@@ -100,13 +100,20 @@
 %setup -q -n %{_packname}-%{version}
 %patch0 -p1
 
+install -d x11vnc/misc
+touch x11vnc/Makefile.in x11vnc/misc/Makefile.in
+
+awk 'BEGIN { f=1; } /# libtool.m4/ { f=0; } { if (f) { print $0; } }' acinclude.m4 > acinclude.m4.new
+mv acinclude.m4.new acinclude.m4
+
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--without-x11vnc
 %{__make}
 
 %install
@@ -147,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2009/07/11 21:30:55  arekm
+- up to 0.9.7
+
 Revision 1.15  2009/07/11 19:55:53  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvncserver/libvncserver-linux.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvncserver/libvncserver.spec?r1=1.15&r2=1.16&f=u