From 77c4862ad09c7677b0b069abfbba8335bb4e94b0 Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Mon, 13 Aug 2018 08:02:01 -0400 Subject: [PATCH] Update to latest stable release 1.2.31.2 Add remmina-gnome-session subpackage for new Kiosk mode --- remmina.spec | 72 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/remmina.spec b/remmina.spec index e035b3e..138b75e 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,21 +1,27 @@ -# Main branch is the "next" branch, not master -%global commit0 6b62986b44a47baa91cd637934092a8d3371c3b9 -%global date 20180408 -%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) +# Main branch is master again. +# We may need to use pre-releases or snapshots again in the future. +#%%global commit0 647d2e8c7dba8451a2d5ef89c9b9551d3ea954fb +#%%global date 20180731 +#%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) # RC upstream releases -#global snapshot rcgit.29 +#%%global snapshot rcgit.29 Name: remmina -Version: 1.2.0 -Release: 0.52%{?snapshot:.%{snapshot}}%{?shortcommit0:.%{date}.git.%{shortcommit0}}%{?dist} +Version: 1.2.31.2 +Release: 1%{?snapshot:.%{snapshot}}%{?shortcommit0:.%{date}.git.%{shortcommit0}}%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.org + +%if %{!?commit0:1}0 +Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-v%{version}.tar.gz +%else %if %{?snapshot:1}0 -Source0: https://github.com/FreeRDP/Remmina/archive/v%{version}-%{snapshot}.tar.gz#/Remmina-%{version}-%{snapshot}.tar.gz +Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}-%{snapshot}/Remmina-v%{version}-%{snapshot}.tar.bz2 %else -Source0: https://github.com/FreeRDP/Remmina/archive/%{commit0}/Remmina-%{commit0}.tar.gz#/Remmina-%{shortcommit0}.tar.gz +Source0: https://gitlab.com/Remmina/Remmina/-/archive/%{commit0}/Remmina-%{commit0}.tar.bz2 +%endif %endif # Cmake helper file to easy build plugins outside remmina source tree @@ -169,9 +175,25 @@ computers in front of either large monitors or tiny net-books. This package contains the SPICE plugin for the Remmina remote desktop client. +%package gnome-session +Summary: Gnome Shell session for Remmina kiosk mode +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: gnome-session + +%description gnome-session +Remmina is a remote desktop client written in GTK+, aiming to be useful for +system administrators and travelers, who need to work with lots of remote +computers in front of either large monitors or tiny net-books. + +This package contains Remmina kiosk mode, including a Gnome Shell session +that shows up under the display manager session menu. %prep -%setup -qn Remmina-%{?snapshot:%{version}-%{snapshot}}%{?commit0} +%if %{!?commit0:1}0 +%setup -qn Remmina-v%{version} +%else +%setup -qn Remmina-%{?snapshot:v%{version}-%{snapshot}}%{?commit0} +%endif %build mkdir -p build @@ -214,7 +236,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/actions/*.* %{_datadir}/icons/hicolor/*/apps/*.* -%{_datadir}/icons/hicolor/*/emblems/remmina-*.png +%{_datadir}/icons/hicolor/*/emblems/remmina-*.svg %{_datadir}/mime/packages/*.xml %{_datadir}/%{name}/ %dir %{_libdir}/remmina/ @@ -234,29 +256,41 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %files plugins-nx %{_libdir}/remmina/plugins/remmina-plugin-nx.so -%{_datadir}/icons/hicolor/*/emblems/remmina-nx.png +%{_datadir}/icons/hicolor/*/emblems/remmina-nx-symbolic.svg %files plugins-rdp %{_libdir}/remmina/plugins/remmina-plugin-rdp.so -%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh.png -%{_datadir}/icons/hicolor/*/emblems/remmina-rdp.png +%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-ssh-symbolic.svg +%{_datadir}/icons/hicolor/*/emblems/remmina-rdp-symbolic.svg %files plugins-vnc %{_libdir}/remmina/plugins/remmina-plugin-vnc.so -%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh.png -%{_datadir}/icons/hicolor/*/emblems/remmina-vnc.png +%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-ssh-symbolic.svg +%{_datadir}/icons/hicolor/*/emblems/remmina-vnc-symbolic.svg %files plugins-xdmcp %{_libdir}/remmina/plugins/remmina-plugin-xdmcp.so -%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh.png -%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp.png +%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-ssh-symbolic.svg +%{_datadir}/icons/hicolor/*/emblems/remmina-xdmcp-symbolic.svg %files plugins-spice %{_libdir}/remmina/plugins/remmina-plugin-spice.so -%{_datadir}/icons/hicolor/*/emblems/remmina-spice.png +%{_datadir}/icons/hicolor/*/emblems/remmina-spice-ssh-symbolic.svg +%{_datadir}/icons/hicolor/*/emblems/remmina-spice-symbolic.svg +%files gnome-session +%{_bindir}/gnome-session-remmina +%{_bindir}/remmina-gnome +%{_datadir}/gnome-session/sessions/remmina-gnome.session +%{_datadir}/xsessions/remmina-gnome.desktop +%{_mandir}/man1/gnome-session-remmina.1.* +%{_mandir}/man1/remmina-gnome.1.* %changelog +* Tue Aug 14 2018 Mike DePaulo - 1.2.31.2-1 +- Update to latest stable release 1.2.31.2 +- Add remmina-gnome-session subpackage for new Kiosk mode + * Sat Jul 14 2018 Fedora Release Engineering - 1.2.0-0.52.20180408.git.6b62986 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild