From eb35ddf7923ab653e4bcdd90819d558b4fbe363f Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 6 Oct 2016 14:06:46 +0100
Subject: [PATCH] Update to 0.6.0 release

---
 gtk-vnc.spec | 43 +++++++++++++++++++++++++------------------
 sources      |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/gtk-vnc.spec b/gtk-vnc.spec
index 1c7e908..dc661fd 100644
--- a/gtk-vnc.spec
+++ b/gtk-vnc.spec
@@ -1,12 +1,15 @@
 # -*- rpm-spec -*-
 
+# This spec file assumes you are building for Fedora 20 or newer,
+# or for RHEL 6 or newer. It may need some tweaks for other distros.
+
 %global with_gir 0
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_gir 1
 %endif
 
 %global with_gtk3 0
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %global with_gtk3 1
 %endif
 
@@ -15,16 +18,23 @@
 %global with_vala 1
 %endif
 
-%global with_pulse 1
+%if 0%{?fedora} >= 25
+    %global tls_priority "@LIBVIRT,SYSTEM"
+%else
+    %if 0%{?fedora} >= 21
+        %global tls_priority "@SYSTEM"
+    %else
+        %global tls_priority "NORMAL"
+    %endif
+%endif
 
 Summary: A GTK2 widget for VNC clients
 Name: gtk-vnc
-Version: 0.5.4
-Release: 4%{?dist}%{?extra_release}
+Version: 0.6.0
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://live.gnome.org/gtk-vnc
 Requires: gvnc = %{version}-%{release}
@@ -33,9 +43,6 @@ BuildRequires: pygtk2-devel python-devel zlib-devel
 BuildRequires: gnutls-devel libgcrypt-devel cyrus-sasl-devel intltool
 %if %{with_gir}
 BuildRequires: gobject-introspection-devel
-%if 0%{?fedora} && 0%{?fedora} < 14
-BuildRequires: gir-repository-devel
-%endif
 %endif
 %if %{with_gtk3}
 BuildRequires: gtk3-devel
@@ -43,9 +50,7 @@ BuildRequires: gtk3-devel
 %if %{with_vala}
 BuildRequires: vala-tools
 %endif
-%if %{with_pulse}
 BuildRequires: pulseaudio-libs-devel
-%endif
 BuildRequires: /usr/bin/pod2man
 
 %description
@@ -97,7 +102,6 @@ with the raw protocol itself.
 
 Libraries, includes, etc. to compile with the gvnc library
 
-%if %{with_pulse}
 %package -n gvncpulse
 Summary: A Pulse Audio bridge for VNC connections
 
@@ -118,7 +122,6 @@ It allows VNC clients to play back audio on the local
 system
 
 Libraries, includes, etc. to compile with the gvnc library
-%endif
 
 %package -n gvnc-tools
 Summary: Command line VNC tools
@@ -155,7 +158,6 @@ Libraries, includes, etc. to compile with the gtk-vnc library
 
 %prep
 %setup -q -n gtk-vnc-%{version} -c
-
 %if %{with_gtk3}
 cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
 %endif
@@ -168,14 +170,16 @@ cp -a gtk-vnc-%{version} gtk-vnc2-%{version}
 %endif
 
 cd gtk-vnc-%{version}
-%configure --with-gtk=2.0 %{gir_arg}
+%configure --with-gtk=2.0 %{gir_arg} \
+	   --with-tls-priority=%{tls_priority}
 %__make %{?_smp_mflags} V=1
 chmod -x examples/*.pl examples/*.js examples/*.py
 cd ..
 
 %if %{with_gtk3}
 cd gtk-vnc2-%{version}
-%configure --with-gtk=3.0 %{gir_arg}
+%configure --with-gtk=3.0 %{gir_arg} \
+	   --with-tls-priority=%{tls_priority}
 %__make %{?_smp_mflags} V=1
 chmod -x examples/*.pl examples/*.js examples/*.py
 cd ..
@@ -215,9 +219,11 @@ rm -fr %{buildroot}
 
 %postun -n gvncpulse -p /sbin/ldconfig
 
+%if %{with_gtk3}
 %post -n gtk-vnc2 -p /sbin/ldconfig
 
 %postun -n gtk-vnc2 -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(-, root, root)
@@ -262,7 +268,6 @@ rm -fr %{buildroot}
 %{_datadir}/gir-1.0/GVnc-1.0.gir
 %endif
 
-%if %{with_pulse}
 %files -n gvncpulse -f %{name}.lang
 %defattr(-, root, root)
 %{_libdir}/libgvncpulse-1.0.so.*
@@ -282,7 +287,6 @@ rm -fr %{buildroot}
 %if %{with_gir}
 %{_datadir}/gir-1.0/GVncPulse-1.0.gir
 %endif
-%endif
 
 %files -n gvnc-tools
 %defattr(-, root, root)
@@ -325,6 +329,9 @@ rm -fr %{buildroot}
 %endif
 
 %changelog
+* Thu Oct  6 2016 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-1
+- Update to 0.6.0 release
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 052b366..89d9dc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc7b79c4b8124294dacf91b8128a158c  gtk-vnc-0.5.4.tar.xz
+f27fa9284276509e8b785e4956d5334f  gtk-vnc-0.6.0.tar.xz