new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9940 ec354946-7b23-47d6-9f5a-488ba84defc7

t/tigervnc/tigervnc-vl.spec

@@ -1,5 +1,5 @@
 Name:		tigervnc
-Version:	1.4.3
+Version:	1.6.0
 Release:	1%{?_dist_release}
 Summary:	A TigerVNC remote display system
 Group:		User Interface/Desktops
@@ -7,8 +7,8 @@ License:	GPLv2+
 URL:		http://www.tigervnc.com
 
 Source0:	%{name}-%{version}.tar.gz
-Source1:	vncserver.service
+Source1:	vncserver.service.upstart
-Source2:	vncserver.sysconfig
+Source2:	vncserver.sysconfig.upstart
 Source3:	10-libvnc.conf
 Source6:	vncviewer.desktop
 
@@ -30,7 +30,10 @@ BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
 BuildRequires:  freetype2-devel, libXdmcp-devel
 BuildRequires:	desktop-file-utils, java-devel, jpackage-utils
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
-BuildRequires:	cmake, fltk-devel
+BuildRequires:	cmake
+# TigerVNC 1.4.x requires fltk 1.3.3 for keyboard handling support
+# See https://github.com/TigerVNC/tigervnc/issues/8, also bug #1208814
+BuildRequires:	fltk-devel >= 1.3.3
 
 Requires(post):	coreutils
 Requires(postun):coreutils
@@ -38,16 +41,15 @@ Requires(postun):coreutils
 Requires:	hicolor-icon-theme
 
 Patch1:		tigervnc-cookie.patch
-Patch2:		tigervnc11-ldnow.patch
 Patch3:		tigervnc-libvnc-os.patch
 Patch4:		tigervnc11-rh692048.patch
 Patch5:		tigervnc-inetd-nowait.patch
 Patch7:		tigervnc-manpages.patch
 Patch8:		tigervnc-getmaster.patch
 Patch9:		tigervnc-shebang.patch
-Patch11:	tigervnc-format-security.patch
 Patch14:	tigervnc-xstartup.patch
-Patch15:	tigervnc-xserver117.patch
+Patch15:	tigervnc-xserver118.patch
+# Patch17:	tigervnc-xorg118-QueueKeyboardEvents.patch
 
 # This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg
 Patch100:       tigervnc-xserver116-rebased.patch
@@ -76,7 +78,7 @@ Requires(postun):initscripts
 %description server
 The VNC system allows you to access the same desktop from a wide
 variety of platforms.  
-This package includes the following 
+This package includes the following components: 
  - TigerVNC server: It allows others to access the desktop on your machine 
  - set of utilities: It makes usage of TigerVNC server more user friendly
  - x0vncserver program: It can export your active X session
@@ -97,7 +99,6 @@ to the TigerVNC server.
 %setup -q
 
 %patch1 -p1 -b .cookie
-%patch2 -p1 -b .ldnow
 %patch3 -p1 -b .libvnc-os
 %patch4 -p1 -b .rh692048
 
@@ -123,14 +124,13 @@ popd
 # Don't use shebang in vncserver script.
 %patch9 -p1 -b .shebang
 
-# Fixed build failure with -Werror=format-security (bug #1037358).
-%patch11 -p1 -b .format-security
-
 # Clearer xstartup file (bug #923655).
 %patch14 -p1 -b .xstartup
 
-# Allow build against xorg-x11-server-1.17.
+# Allow build against xorg-x11-server-1.18.
-%patch15 -p1 -b .xserver117
+%patch15 -p1 -b .xserver118
+
+# %patch17 -p1 -b .xorg118-QueueKeyboardEvents
 
 %build
 #export CFLAGS="$RPM_OPT_FLAGS -fpic"
@@ -270,6 +270,9 @@ fi
 %{_datadir}/vnc/classes/*
 
 %changelog
+* Sun Jan 10 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.6.0
+- new upstream release
+
 * Sun Mar 22 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.4.3-1
 - new upstream release