diff --git a/.gitignore b/.gitignore index 8af921d..73d5318 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ remmina-0.7.5.tar.gz /Remmina-0387ee0.tar.gz /Remmina-205df66.tar.gz /Remmina-08f5b4b.tar.gz +/Remmina-1.2.0-rcgit.26.tar.gz diff --git a/remmina-format-security.patch b/remmina-format-security.patch deleted file mode 100644 index 9ec275a..0000000 --- a/remmina-format-security.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Remmina-08f5b4be5e31a44765d651009be2ac7797fc44ac.old/remmina-plugins/exec/exec_plugin.c Remmina-08f5b4be5e31a44765d651009be2ac7797fc44ac/remmina-plugins/exec/exec_plugin.c ---- Remmina-08f5b4be5e31a44765d651009be2ac7797fc44ac.old/remmina-plugins/exec/exec_plugin.c 2017-12-20 14:08:42.167227579 +0100 -+++ Remmina-08f5b4be5e31a44765d651009be2ac7797fc44ac/remmina-plugins/exec/exec_plugin.c 2017-12-20 14:17:09.688627742 +0100 -@@ -201,7 +201,7 @@ - _("WARNING! Executing a command synchronously, may hung Remmina.\r" - "Do you really want to continue?"); - dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, -- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, sync_warning)); -+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", sync_warning)); - gint result = gtk_dialog_run (GTK_DIALOG (dialog)); - - switch (result) diff --git a/remmina.spec b/remmina.spec index d159e5a..cff39d4 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,19 +1,19 @@ # Main branch is the "next" branch, not master -%global commit0 08f5b4be5e31a44765d651009be2ac7797fc44ac -%global date 20171220 -%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) +#%%global commit0 08f5b4be5e31a44765d651009be2ac7797fc44ac +#%%global date 20171220 +#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) -# RC releases -#%%global snapshot rcgit.25 +# RC upstream releases +%global snapshot rcgit.26 Name: remmina Version: 1.2.0 -Release: 0.43%{?snapshot:.%{snapshot}}%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 0.44%{?snapshot:.%{snapshot}}%{?shortcommit0:.%{date}.git.%{shortcommit0}}%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.sourceforge.net -%if %{?snapshot}0 -Source0: https://github.com/FreeRDP/Remmina/archive/v%{version}%{?snapshot:-%{snapshot}}.tar.gz#/Remmina-%{version}%{?snapshot:-%{snapshot}}.tar.gz +%if %{?snapshot:1}0 +Source0: https://github.com/FreeRDP/Remmina/archive/v%{version}-%{snapshot}.tar.gz#/Remmina-%{version}-%{snapshot}.tar.gz %else Source0: https://github.com/FreeRDP/Remmina/archive/%{commit0}/Remmina-%{commit0}.tar.gz#/Remmina-%{shortcommit0}.tar.gz %endif @@ -24,8 +24,6 @@ Source0: https://github.com/FreeRDP/Remmina/archive/%{commit0}/Remmina-%{c # So we can't use it directly only as instructions. Source1: pluginBuild-CMakeLists.txt -Patch0: %{name}-format-security.patch - BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils BuildRequires: gettext @@ -171,7 +169,6 @@ client. %prep %setup -qn Remmina-%{?snapshot:%{version}-%{snapshot}}%{?commit0} -%patch0 -p1 %build mkdir -p build @@ -329,6 +326,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jan 05 2018 Pavel Alexeev - 1.2.0-0.44.rcgit.26 +- Update to version v1.2.0-rcgit.26. +- Drop remmina-format-security.patch which seams handled upstream in different way. + * Wed Dec 20 2017 Simone Caronni - 1.2.0-0.43.20171220git08f5b4b - Update to latest 1.2.0 snapshot (rcgit.25). - Gnome plugin renamed to secret. diff --git a/sources b/sources index f1fa8e4..7859280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Remmina-08f5b4b.tar.gz) = 3ea1191dccd2b84526c17f99c3fb14894e6b020fa9aa7d78c989a348640ed75e94c52cdc746ac58f650b30ca61006c0723948ba1448f067aec1cdbe91f5be853 +SHA512 (Remmina-1.2.0-rcgit.26.tar.gz) = 800675123153c0696a032d91e81d895e849b2dadb51664a2e1b4a21e8fdc76d204e3eea2a74b256be2a6bf21d7171ab447dc51ee1cb53ae49f894bb4bf0013af