rpms/tightvnc/devel tightvnc-15-new-libtool.patch, NONE, 1.1 tightvnc.spec, 1.3, 1.4

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/tightvnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6290

Modified Files:
	tightvnc.spec 
Added Files:
	tightvnc-15-new-libtool.patch 
Log Message:
- fix building with new libtool


tightvnc-15-new-libtool.patch:

--- NEW FILE tightvnc-15-new-libtool.patch ---
diff -up tightvnc-1.5.0-20081120svn3200/unix/xserver.patch.new-libtool tightvnc-1.5.0-20081120svn3200/unix/xserver.patch
--- tightvnc-1.5.0-20081120svn3200/unix/xserver.patch.new-libtool	2008-11-20 14:22:05.000000000 +0100
+++ tightvnc-1.5.0-20081120svn3200/unix/xserver.patch	2008-11-20 14:22:34.000000000 +0100
@@ -1,15 +1,23 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2008-10-15 17:22:22.000000000 +0200
-+++ xserver/configure.ac	2008-10-15 17:22:23.000000000 +0200
-@@ -30,7 +30,6 @@ AC_INIT([xorg-server], 1.5.2, [https://b
- RELEASE_DATE="10 October 2008"
+--- xserver/configure.ac.vnc	2008-11-20 14:21:34.000000000 +0100
++++ xserver/configure.ac	2008-11-20 14:22:17.000000000 +0100
+@@ -31,7 +31,6 @@ RELEASE_DATE="5 November 2008"
+ REMEMBER_REMEMBER="The Fifth of November"
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
  dnl this gets generated by autoheader, and thus contains all the defines.  we
  dnl don't ever actually use it, internally.
-@@ -1214,6 +1213,9 @@ if test "x$XVFB" = xyes; then
+@@ -54,6 +53,7 @@ dnl kdrive-config.h covers the kdrive DD
+ AC_CONFIG_HEADERS(include/kdrive-config.h)
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_AS
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+@@ -1215,6 +1215,9 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -19,7 +27,7 @@ diff -up xserver/configure.ac.vnc xserve
  
  dnl Xnest DDX
  
-@@ -2178,6 +2180,7 @@ hw/dmx/input/Makefile
+@@ -2179,6 +2182,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -28,8 +36,8 @@ diff -up xserver/configure.ac.vnc xserve
  hw/xgl/egl/Makefile
  hw/xgl/egl/module/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2008-10-15 17:22:23.000000000 +0200
-+++ xserver/hw/Makefile.am	2008-10-15 17:22:23.000000000 +0200
+--- xserver/hw/Makefile.am.vnc	2008-11-20 14:21:34.000000000 +0100
++++ xserver/hw/Makefile.am	2008-11-20 14:21:38.000000000 +0100
 @@ -43,7 +43,8 @@ SUBDIRS =			\
  	$(DMX_SUBDIRS)		\
  	$(KDRIVE_SUBDIRS)	\
@@ -41,8 +49,8 @@ diff -up xserver/hw/Makefile.am.vnc xser
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2008-10-15 17:22:23.000000000 +0200
-+++ xserver/mi/miinitext.c	2008-10-15 17:22:23.000000000 +0200
+--- xserver/mi/miinitext.c.vnc	2008-11-20 14:21:37.000000000 +0100
++++ xserver/mi/miinitext.c	2008-11-20 14:21:38.000000000 +0100
 @@ -292,6 +292,7 @@ extern void BigReqExtensionInit(INITARGS
  #ifdef MITMISC
  extern void MITMiscExtensionInit(INITARGS);


Index: tightvnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/tightvnc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tightvnc.spec	20 Nov 2008 13:07:19 -0000	1.3
+++ tightvnc.spec	20 Nov 2008 15:00:45 -0000	1.4
@@ -48,6 +48,7 @@
 Patch6:		tightvnc-newfbsize.patch
 Patch7:		tightvnc-rh212985.patch
 Patch8:		tightvnc-viewer-reparent.patch
+Patch9:		tightvnc-15-new-libtool.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -86,6 +87,8 @@
 %prep
 %setup -q -n %{name}-%{version}-%{releasetag}
 
+%patch9 -p1 -b .new-libtool
+
 cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
@@ -237,6 +240,7 @@
 %changelog
 * Thu Nov 20 2008 Adam Tkac <atkac redhat com> 1.5.0-0.9.20081120svn3200
 - updated to r3200 (IPv6 support in viewer + some additional fixes)
+- fix building with new libtool
 
 * Thu Oct 23 2008 Adam Tkac <atkac redhat com> 1.5.0-0.8.20081015svn3022
 - ported all needed patches from vnc devel branch except IPv6 patch