[remmina/f21: 8/8] Merge branch 'master' into f21

[Simone Caronni]

commit b16d4fab6ed917d1f75a2031104e75ef4ef67c40
Merge: c430d09 ac158f2
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Oct 21 16:10:32 2014 +0200

    Merge branch 'master' into f21
    
    Realign with master. Forgot to do a git pull before committing stuff.

 .gitignore                 |    1 +
 pluginBuild-CMakeLists.txt |   34 +++++++++++++++++++++++++++++++++
 remmina.spec               |   45 +++++++++++++++++++++++++++++++++++++++----
 sources                    |    2 +-
 4 files changed, 76 insertions(+), 6 deletions(-)
---
diff --cc remmina.spec
index c627b10,6510d73..fec42c6
--- a/remmina.spec
+++ b/remmina.spec
@@@ -13,9 -13,13 +13,15 @@@ License:        GPLv2+ and MI
  URL:            http://remmina.sourceforge.net
  # VCS: git:https://github.com/FreeRDP/Remmina.git
  Source0:        https://github.com/FreeRDP/Remmina/archive/%{commit}/Remmina-%{commit}.tar.gz
 +# https://github.com/FreeRDP/Remmina/issues/228
 +Patch0:         %{name}-rfx_context_new.patch
  
+ # Cmake helper file to easy build plugins outside remmina sourse tree
+ # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which
+ # use http://www.muflone.com/remmina-plugin-builder/ with remmina bundled source.
+ # So we can't use it directly only as instructions.
+ Source1:        pluginBuild-CMakeLists.txt
+ 
  BuildRequires:  avahi-ui-devel
  BuildRequires:  cmake >= 2.8
  BuildRequires:  desktop-file-utils
@@@ -140,8 -147,9 +149,10 @@@ client
  
  %prep
  %setup -qn Remmina-%{commit}
 +%patch0 -p1
  
+ %patch0 -p1 -b .rfx_context_new
+ 
  # Do not install tools into user home directory
  sed -i \
      -e 's@$ENV{HOME}/.%{name}@%{_libexecdir}/%{name}@g' \