[remmina] Update to latest 1.1.1 snapshot

[Simone Caronni]

commit ac158f2319e868dba09803e50557a92c31bc5a72
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Oct 21 16:09:21 2014 +0200

    Update to latest 1.1.1 snapshot

 .gitignore                      |    1 +
 remmina-1.0-clipboard-fix.patch |  313 ---------------------------------------
 remmina-rfx_context_new.patch   |   12 ++
 remmina.spec                    |   19 ++-
 sources                         |    2 +-
 5 files changed, 26 insertions(+), 321 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac99682..03d15a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ remmina-0.7.5.tar.gz
 /Remmina-26b814aec6e930746d079c885449dd50d3484fb0.tar.gz
 /Remmina-1470c974cddaede87d09345f712202ddcda0810b.tar.gz
 /Remmina-65d2ca4872150942cced1fbe92248dd933e9c0cb.tar.gz
+/Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz
diff --git a/remmina-rfx_context_new.patch b/remmina-rfx_context_new.patch
new file mode 100644
index 0000000..7acffe9
--- /dev/null
+++ b/remmina-rfx_context_new.patch
@@ -0,0 +1,12 @@
+diff -Naur Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.old/remmina-plugins/rdp/rdp_plugin.c Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b/remmina-plugins/rdp/rdp_plugin.c
+--- Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.old/remmina-plugins/rdp/rdp_plugin.c	2014-10-21 15:28:25.956724006 +0200
++++ Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b/remmina-plugins/rdp/rdp_plugin.c	2014-10-21 15:29:01.772465878 +0200
+@@ -257,7 +257,7 @@
+ 		settings->LargePointerFlag = True;
+ 		settings->PerformanceFlags = PERF_FLAG_NONE;
+ 
+-		rfi->rfx_context = rfx_context_new();
++		rfi->rfx_context = rfx_context_new(FALSE);
+ 	}
+ 
+ 	freerdp_client_load_addins(instance->context->channels, instance->settings);
diff --git a/remmina.spec b/remmina.spec
index 76e9c40..6510d73 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -1,17 +1,17 @@
 # Review at https://bugzilla.redhat.com/show_bug.cgi?id=553402
 
 # https://fedoraproject.org/wiki/Packaging:SourceURL#Github
-%global commit 65d2ca4872150942cced1fbe92248dd933e9c0cb
+%global commit efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           remmina
-Version:        1.0.0
-Release:        15%{?shortcommit:.git.%{shortcommit}}%{?dist}
+Version:        1.1.1
+Release:        1%{?shortcommit:.git.%{shortcommit}}%{?dist}
 Summary:        Remote Desktop Client
 
 License:        GPLv2+ and MIT
 URL:            http://remmina.sourceforge.net
-#VCS: git:https://github.com/FreeRDP/Remmina.git
+# VCS: git:https://github.com/FreeRDP/Remmina.git
 Source0:        https://github.com/FreeRDP/Remmina/archive/%{commit}/Remmina-%{commit}.tar.gz
 
 # Cmake helper file to easy build plugins outside remmina sourse tree
@@ -37,8 +37,8 @@ BuildRequires:  libxkbfile-devel
 BuildRequires:  telepathy-glib-devel
 BuildRequires:  vte3-devel
 
-# https://github.com/FreeRDP/Remmina/issues/280#issuecomment-52254273 Thanks to Giovanni Panozzo
-Patch0:         remmina-1.0-clipboard-fix.patch
+# https://github.com/FreeRDP/Remmina/issues/228
+Patch0: %{name}-rfx_context_new.patch
 
 # We don't ship the remmina-plugins-common package any longer
 Provides:       remmina-plugins-common = %{version}
@@ -148,7 +148,7 @@ client.
 %prep
 %setup -qn Remmina-%{commit}
 
-%patch0 -p1 -b .clipboard
+%patch0 -p1 -b .rfx_context_new
 
 # Do not install tools into user home directory
 sed -i \
@@ -305,6 +305,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Oct 21 2014 Simone Caronni <negativo17 at gmail.com> - 1.1.1-1.git.efb7b5f
+- Update to latest snapshot, version now at 1.1.1. Remove upstreamed patch.
+- Full GTK3 version removed and moved to 1.2.0 branch.
+- Add patch that was lost upstram in the various branching.
+
 * Wed Sep 3 2014 Orion Poplawski <orion at cora.nwra.com> - 1.0.0-15.git.65d2ca4
 - Have remmina-plugins-nx require nxproxy (bug #1004860)
 
diff --git a/sources b/sources
index 9bf32ba..10c2c9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fffbf18cdbcb280a0d0ae6e4ecf05f03  Remmina-65d2ca4872150942cced1fbe92248dd933e9c0cb.tar.gz
+777bfceeb66be43779e53e87ce8d3f8b Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz