diff --git a/.gitignore b/.gitignore index 03d15a9..6e961b2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ remmina-0.7.5.tar.gz /Remmina-1470c974cddaede87d09345f712202ddcda0810b.tar.gz /Remmina-65d2ca4872150942cced1fbe92248dd933e9c0cb.tar.gz /Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz +/v1.2.0-rcgit.1.tar.gz diff --git a/remmina-rfx_context_new.patch b/remmina-rfx_context_new.patch deleted file mode 100644 index 7acffe9..0000000 --- a/remmina-rfx_context_new.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-tools.patch b/remmina-tools.patch new file mode 100644 index 0000000..6bf0c93 --- /dev/null +++ b/remmina-tools.patch @@ -0,0 +1,28 @@ +From 17827fbd95156ad249b429bb0d862b5affa615e8 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 24 Nov 2014 12:28:47 +0100 +Subject: [PATCH] install external tools to datadir, not user's home dir + +--- + remmina/external_tools/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/remmina/external_tools/CMakeLists.txt b/remmina/external_tools/CMakeLists.txt +index 9cc0f89..9492a9c 100644 +--- a/remmina/external_tools/CMakeLists.txt ++++ b/remmina/external_tools/CMakeLists.txt +@@ -30,10 +30,7 @@ + # version. If you delete this exception statement from all source + # files in the program, then also delete it here. + +- +-set(EXTERNAL_TOOLS_DIR "$ENV{HOME}/.remmina/external_tools") +- +-file(MAKE_DIRECTORY ${EXTERNAL_TOOLS_DIR}) ++set(EXTERNAL_TOOLS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/remmina/external_tools") + + INSTALL(PROGRAMS launcher.sh pause.sh remmina_filezilla_sftp.sh remmina_filezilla_sftp_pki.sh remmina_nslookup.sh remmina_ping.sh remmina_traceroute.sh DESTINATION ${EXTERNAL_TOOLS_DIR}) + +-- +2.1.0 + diff --git a/remmina.spec b/remmina.spec index 4f97f8f..dba40cb 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,18 +1,14 @@ # Review at https://bugzilla.redhat.com/show_bug.cgi?id=553402 -# https://fedoraproject.org/wiki/Packaging:SourceURL#Github -%global commit efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: remmina -Version: 1.1.1 -Release: 2%{?shortcommit:.git.%{shortcommit}}%{?dist} +Version: 1.2.0 +Release: 0.1.rcgit.1%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT 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 +Source0: https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.1.tar.gz # Cmake helper file to easy build plugins outside remmina sourse tree # See http://www.muflone.com/remmina-plugin-rdesktop/english/install.html which @@ -23,7 +19,7 @@ Source1: pluginBuild-CMakeLists.txt BuildRequires: avahi-ui-devel BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils -BuildRequires: freerdp-devel >= 1:1.1.0 +BuildRequires: freerdp-devel >= 1:1.2.0-0.4.beta.1 BuildRequires: gettext BuildRequires: gnutls-devel BuildRequires: gtk3-devel @@ -33,13 +29,14 @@ BuildRequires: libgnome-keyring-devel BuildRequires: libjpeg-devel BuildRequires: libssh-devel >= 0.4 BuildRequires: libvncserver-devel +BuildRequires: libwinpr-devel >= 1:1.2.0-0.4.beta.1 BuildRequires: libxkbfile-devel BuildRequires: telepathy-glib-devel BuildRequires: vte3-devel BuildRequires: libappindicator-gtk3-devel -# https://github.com/FreeRDP/Remmina/issues/228 -Patch0: %{name}-rfx_context_new.patch +# https://github.com/FreeRDP/Remmina/commit/17827fbd95156ad249b429bb0d862b5affa615e8 +Patch0: %{name}-tools.patch # We don't ship the remmina-plugins-common package any longer Provides: remmina-plugins-common = %{version} @@ -147,18 +144,8 @@ client. %prep -%setup -qn Remmina-%{commit} - -%patch0 -p1 -b .rfx_context_new - -# Do not install tools into user home directory -sed -i \ - -e 's@$ENV{HOME}/.%{name}@%{_libexecdir}/%{name}@g' \ - -e '/^file(MAKE_DIRECTORY/d' \ - %{name}/external_tools/CMakeLists.txt -sed -i \ - -e 's@%s/.%{name}@%{_libexecdir}/%{name}@g' \ - %{name}/src/%{name}_external_tools.c +%setup -qn Remmina-1.2.0-rcgit.1 +%patch0 -p1 #? 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 @@ -270,7 +257,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/actions/*.* %{_datadir}/icons/hicolor/*/apps/*.* %{_datadir}/icons/hicolor/*/emblems/remmina-sftp.png -%{_libexecdir}/%{name}/ +%{_datadir}/%{name}/ %dir %{_libdir}/remmina/ %dir %{_libdir}/remmina/plugins/ @@ -306,6 +293,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Dec 16 2014 Simone Caronni - 1.2.0-0.1.rcgit.1 +- Update to latest 1.2.0 snapshot. +- Require latest FreeRDP 1.2.0-beta1+android9 for building. +- External tools now in datadir, use upstream commit for it. +- Removed upstreamed patch. + * Thu Oct 23 2014 Pavel Alexeev - 1.1.1-2.git.efb7b5f - Try enable APPINDICATOR by suggestion of Giovanni Panozzo. diff --git a/sources b/sources index e34d0d6..71f6982 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -777bfceeb66be43779e53e87ce8d3f8b Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz +bd92d1beb5c0c3acb6e32ad546e30d84 v1.2.0-rcgit.1.tar.gz