Update to latest snapshot

epel8
Simone Caronni 9 years ago
parent 0cc55c70ba
commit f1d8479056

@ -1,28 +0,0 @@
From 17827fbd95156ad249b429bb0d862b5affa615e8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
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

@ -1,20 +1,17 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=553402
# https://fedoraproject.org/wiki/Packaging:SourceURL#Github
%global commit b3237e832df87bffc176c4f4024000b3d2d776cf
%global shortcommit %(c=%{commit}; echo ${c:0:7})
# Main branch is the "next" branch, not master
%global commit0 8855df73b33fe5b92142e257c9ff679dea4fbd82
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: remmina
Version: 1.2.0
Release: 0.8%{?shortcommit:.git.%{shortcommit}}%{?dist}
Release: 0.9%{?shortcommit0:.git.%{shortcommit0}}%{?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
# Cmake helper file to easy build plugins outside remmina sourse tree
Source0: https://github.com/FreeRDP/Remmina/archive/%{commit0}/Remmina-%{commit0}.tar.gz#/Remmina-%{shortcommit0}.tar.gz
# Cmake helper file to easy build plugins outside remmina source 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.
@ -29,9 +26,9 @@ BuildRequires: libgcrypt-devel
BuildRequires: pkgconfig(appindicator3-0.1)
BuildRequires: pkgconfig(avahi-ui) >= 0.6.30
BuildRequires: pkgconfig(avahi-ui-gtk3) >= 0.6.30
BuildRequires: pkgconfig(freerdp) >= 1.2.0-beta1
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(freerdp) >= 1.2.0
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libssh) >= 0.6
BuildRequires: pkgconfig(libvncserver)
BuildRequires: pkgconfig(telepathy-glib)
@ -144,7 +141,7 @@ client.
%prep
%setup -qn Remmina-%{commit}
%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
@ -249,7 +246,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%doc AUTHORS ChangeLog LICENSE README
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc AUTHORS ChangeLog README
%{_bindir}/%{name}
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/applications/*.desktop
@ -292,6 +291,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sun Nov 15 2015 Simone Caronni <negativo17@gmail.com> - 1.2.0-0.9.git.8855df7
- Update to latest snapshot.
- Update to new packaging guidelines for GitHub sources and license tag.
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-0.8.git.b3237e8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

Loading…
Cancel
Save