From 3c2ed02dfd50aec4ea2d4baa0d68fc1501ad3fb6 Mon Sep 17 00:00:00 2001 From: David King Date: Nov 16 2015 10:18:48 +0000 Subject: Rebuild for new FreeRDP --- diff --git a/vinagre-3.18.2-recent-freerdp.patch b/vinagre-3.18.2-recent-freerdp.patch new file mode 100644 index 0000000..53b9ef3 --- /dev/null +++ b/vinagre-3.18.2-recent-freerdp.patch @@ -0,0 +1,25 @@ +From c8352d4ba348848113d47d4df1659b88affa0789 Mon Sep 17 00:00:00 2001 +From: David King +Date: Mon, 16 Nov 2015 10:13:19 +0000 +Subject: [PATCH] Fix build against recent versions of FreeRDP + +--- + plugins/rdp/vinagre-rdp-tab.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c +index 3205a67..12439e3 100644 +--- a/plugins/rdp/vinagre-rdp-tab.c ++++ b/plugins/rdp/vinagre-rdp-tab.c +@@ -1108,7 +1108,7 @@ open_freerdp (VinagreRdpTab *rdp_tab) + settings->encryption_level = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; + #endif + #include +-#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) ++#if (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2 && FREERDP_VERSION_REVISION >= 1) || (FREERDP_VERSION_MAJOR == 2) + settings->UseRdpSecurityLayer = FALSE; + #else + settings->DisableEncryption = FALSE; +-- +2.6.3 + diff --git a/vinagre.spec b/vinagre.spec index e4d74de..e89eb9b 100644 --- a/vinagre.spec +++ b/vinagre.spec @@ -4,7 +4,7 @@ Name: vinagre Version: 3.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: VNC client for GNOME Group: Applications/System @@ -12,6 +12,7 @@ License: GPLv2+ URL: https://wiki.gnome.org/Apps/Vinagre #VCS: git:git://git.gnome.org/vinagre Source0: https://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz +Patch0: vinagre-3.18.2-recent-freerdp.patch %if 0%{?with_spice} BuildRequires: pkgconfig(spice-client-gtk-3.0) @@ -60,6 +61,7 @@ Apart from the VNC protocol, vinagre supports Spice and RDP. %prep %setup -q +%patch0 -p1 %build @@ -117,6 +119,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Nov 16 2015 David King - 3.18.2-2 +- Rebuild for new freerdp + * Thu Nov 12 2015 David King - 3.18.2-1 - Update to 3.18.2