From d15cbf33ccf9095947f5c4c779fc45b764ee3e67 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Apr 22 2015 09:58:46 +0000 Subject: Merge branch 'f21' into f22 --- 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 - or off with -=0\n" "Parameters which take a value can be specified as " "- \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 d4babc1..46e9a65 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -1,6 +1,6 @@ Name: tigervnc Version: 1.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A TigerVNC remote display system %global _hardened_build 1 @@ -355,6 +355,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Apr 22 2015 Tim Waugh - 1.4.3-6 +- Removed incorrect parameters from vncviewer manpage (bug #1213199). + * Fri Apr 10 2015 Tim Waugh - 1.4.3-5 - Explicit version build dependency for fltk (bug #1208814).