twaugh pushed to tigervnc (master). "Merge branch 'f21' into f22"

[notifications at fedoraproject.org]

>From 07a335ed9d6f0bd7cfce053ac91301ccbf864b0b Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh at redhat.com>
Date: Fri, 10 Apr 2015 12:38:29 +0100
Subject: Explicit version build dependency for fltk (bug #1208814).

Resolves: rhbz#1208814
(cherry picked from commit e984495473ce086408e42ec7c95adaa0b9d2e567)

diff --git a/tigervnc.spec b/tigervnc.spec
index 642bd5c..01b87ab 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -25,7 +25,10 @@ BuildRequires:	mesa-libGL-devel, libXinerama-devel, ImageMagick
 BuildRequires:  freetype-devel, libXdmcp-devel
 BuildRequires:	desktop-file-utils, java-devel, jpackage-utils
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
-BuildRequires:	systemd, cmake, fltk-devel
+BuildRequires:	systemd, 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
 %ifnarch s390 s390x
 BuildRequires:  xorg-x11-server-devel
 %endif
@@ -345,6 +348,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Apr 16 2015 Tim Waugh <twaugh at redhat.com> - 1.4.3-3
+- Explicit version build dependency for fltk (bug #1208814).
+
 * Fri Mar  6 2015 Tim Waugh <twaugh at redhat.com> - 1.4.3-2
 - Don't disable Xinerama extension (upstream #147).
 
-- 
cgit v0.10.2


>From 33c4fa9cc83191c0fdc5469bfff42a245ef9e523 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh at redhat.com>
Date: Wed, 22 Apr 2015 10:48:49 +0100
Subject: Removed incorrect parameters from vncviewer manpage (bug #1213199).

Resolves: rhbz#1213199

diff --git a/tigervnc-manpages.patch b/tigervnc-manpages.patch
index 0f143de..989e704 100644
--- a/tigervnc-manpages.patch
+++ b/tigervnc-manpages.patch
@@ -24,28 +24,3 @@ diff -up tigervnc-1.4.2/vncviewer/vncviewer.cxx.manpages tigervnc-1.4.2/vncviewe
            "Parameters can be turned on with -<param> or off with -<param>=0\n"
            "Parameters which take a value can be specified as "
            "-<param> <value>\n"
-diff -up tigervnc-1.4.2/vncviewer/vncviewer.man.manpages tigervnc-1.4.2/vncviewer/vncviewer.man
---- tigervnc-1.4.2/vncviewer/vncviewer.man.manpages	2015-02-12 19:39:32.327789300 +0000
-+++ tigervnc-1.4.2/vncviewer/vncviewer.man	2015-02-13 09:54:55.042903357 +0000
-@@ -219,6 +219,10 @@ This option specifies the preferred enco
- Disable lossy JPEG compression in Tight encoding. Default is off.
- .
- .TP
-+.B \-ImprovedHextile
-+Try harder to compress data (default).
-+.
-+.TP
- .B \-QualityLevel \fIlevel\fP
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
- \fB-AutoSelect\fP is turned on. Default is 8.
-@@ -271,6 +275,10 @@ command is executed with the environment
- \fIR\fR, and \fIG\fR taken the values of the local port number, the remote
- host, the port number on the remote host, and the gateway machine
- respectively.
-+.
-+.TP
-+.B \-ZlibLevel
-+Zlib compression level.
- 
- .SH FILES
- .TP
diff --git a/tigervnc.spec b/tigervnc.spec
index 01b87ab..1f90a51 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	1.4.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -348,6 +348,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Apr 22 2015 Tim Waugh <twaugh at redhat.com> - 1.4.3-4
+- Removed incorrect parameters from vncviewer manpage (bug #1213199).
+
 * Thu Apr 16 2015 Tim Waugh <twaugh at redhat.com> - 1.4.3-3
 - Explicit version build dependency for fltk (bug #1208814).
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tigervnc.git/commit/?h=master&id=d15cbf33ccf9095947f5c4c779fc45b764ee3e67