From 141cf1c1c5dd7c08b6ea73ceaad775225c103e90 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <pahan@hubbitus.info>
Date: Tue, 16 Aug 2016 13:24:25 +0300
Subject: [PATCH] - Update to try solve issues with tray icons -
 https://github.com/FreeRDP/Remmina/issues/944#issuecomment-239913278 - Drop
 old issue 292 hack. - Conditionally allow build by hash or pre-releases.

---
 .gitignore   |  1 +
 remmina.spec | 22 +++++++++++++---------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdca729..f518435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ remmina-0.7.5.tar.gz
 /Remmina-1.2.0.rcgit.13.tar.gz
 /Remmina-1.2.0-rcgit.14.tar.gz
 /Remmina-cbcb19e.tar.gz
+/Remmina-679bb8e.tar.gz
diff --git a/remmina.spec b/remmina.spec
index 4450ae8..d302f3c 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -1,18 +1,21 @@
 # Main branch is the "next" branch, not master
-%global commit0 cbcb19ec443e869d0e82a07a4f29c9cd8a5bc134
+%global commit0 679bb8eee78765252b62aa56078a9fabe50563f8
 %global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 # RC releases
-#%global snapshot rcgit.14
+#%%global snapshot rcgit.14
 
 Name:          remmina
 Version:       1.2.0
-Release:       0.20%{?snapshot:.%{snapshot}}%{?shortcommit0:.git.%{shortcommit0}}%{?dist}
+Release:       0.21%{?snapshot:.%{snapshot}}%{?shortcommit0:.git.%{shortcommit0}}%{?dist}
 Summary:       Remote Desktop Client
 License:       GPLv2+ and MIT
 URL:           http://remmina.sourceforge.net
+%if %{?shapshot}0
+Source0:       https://github.com/FreeRDP/Remmina/archive/v%{version}%{?snapshot:-%{snapshot}}.tar.gz#/Remmina-%{version}%{?snapshot:-%{snapshot}}.tar.gz
+%else
 Source0:       https://github.com/FreeRDP/Remmina/archive/%{commit0}/Remmina-%{commit0}.tar.gz#/Remmina-%{shortcommit0}.tar.gz
-#Source0:       https://github.com/FreeRDP/Remmina/archive/v%{version}%{?snapshot:-%{snapshot}}.tar.gz#/Remmina-%{version}%{?snapshot:-%{snapshot}}.tar.gz
+%endif
 
 # Cmake helper file to easy build plugins outside remmina source tree
 # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which
@@ -160,11 +163,7 @@ client.
 
 
 %prep
-#%setup -qn Remmina-%{version}%{?snapshot:-%{snapshot}}
-%setup -qn Remmina-%{commit0}
-
-#? Hack: https://github.com/FreeRDP/Remmina/issues/292
-sed -i 's#install(DIRECTORY include/remmina DESTINATION include/remmina #install(DIRECTORY remmina/include/remmina DESTINATION include/ #' CMakeLists.txt
+%setup -qn Remmina-%{?snapshot:%{version}-%{snapshot}}%{?commit0}
 
 %build
 mkdir -p build
@@ -324,6 +323,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Aug 16 2016 Pavel Alexeev <Pahan@Hubbitus.info> - 1.2.0-0.21.git.679bb8e
+- Update to try solve issues with tray icons - https://github.com/FreeRDP/Remmina/issues/944#issuecomment-239913278
+- Drop old issue 292 hack.
+- Conditionally allow build by hash or pre-releases.
+
 * Fri Aug 12 2016 Simone Caronni <negativo17@gmail.com> - 1.2.0-0.20.git.cbcb19e
 - Update to latest snapshot.
 
diff --git a/sources b/sources
index 0c16261..42050a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-796893f059ccabede4840843d5ebf730  Remmina-cbcb19e.tar.gz
+063c4769e2db37d2fdfad1285fb870c1  Remmina-679bb8e.tar.gz