From 841663e83b8d2f1ee3b21fea460bdab6a02ce9d7 Mon Sep 17 00:00:00 2001 From: Phil Wyett Date: Wed, 19 Jan 2022 09:31:30 +0000 Subject: [PATCH] Remove unneeded BuildRequires for gtk-vnc-2.0. --- .cvsignore | 0 .gitignore | 1 + Makefile | 21 --------------------- remmina.spec | 46 +++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 5 files changed, 43 insertions(+), 27 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore index 2d9c96f..38cbe28 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ remmina-0.7.5.tar.gz /remmina-1.4.19.tar.gz /remmina-1.4.20.tar.gz /remmina-1.4.21.tar.gz +/remmina-1.4.23.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 4881f63..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: remmina -# $Id$ -NAME := remmina -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/remmina.spec b/remmina.spec index e61886a..41c6c75 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,8 +1,8 @@ -%global commit0 bbd98e2b69c99f30c81ffbc88ebc27d469287e4d +%global commit0 a03c1648a090458736434c77c0be00a7cf9cc44b Name: remmina -Version: 1.4.21 -Release: 1%{?dist} +Version: 1.4.23 +Release: 2%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.org @@ -34,12 +34,14 @@ BuildRequires: kf5-kwallet-devel BuildRequires: libappstream-glib BuildRequires: libgcrypt-devel BuildRequires: libsodium-devel +# pyhoca-cli needed as build dep for x2go plugin to be built when actually +# only a runtime dep. Has a FIXME on it in upstream tarball. +BuildRequires: pyhoca-cli BuildRequires: pkgconfig(appindicator3-0.1) BuildRequires: pkgconfig(avahi-ui) >= 0.6.30 BuildRequires: pkgconfig(avahi-ui-gtk3) >= 0.6.30 BuildRequires: pkgconfig(freerdp2) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtk-vnc-2.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) @@ -182,6 +184,19 @@ client. It will be activated automatically if KDE Wallet is installed and running. +%package plugins-x2go +Summary: x2go plugin for Remmina Remote Desktop Client +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pyhoca-cli + +%description plugins-x2go +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 the x2go plugin for the Remmina remote desktop client. + + %package gnome-session Summary: Gnome Shell session for Remmina kiosk mode Requires: %{name}%{?_isa} = %{version}-%{release} @@ -224,7 +239,8 @@ export CFLAGS="%{optflags} -std=gnu99" -DWITH_NEWS=OFF \ -DWITH_SPICE=ON \ -DWITH_TELEPATHY=OFF \ - -DWITH_VTE=ON + -DWITH_VTE=ON \ + -DWITH_X2GO=ON %cmake3_build @@ -293,6 +309,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %files plugins-kwallet %{_libdir}/remmina/plugins/remmina-plugin-kwallet.so +%files plugins-x2go +%{_libdir}/remmina/plugins/remmina-plugin-x2go.so +%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg +%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-x2go-symbolic.svg + %files gnome-session %{_bindir}/gnome-session-remmina %{_bindir}/remmina-gnome @@ -302,9 +323,24 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %{_mandir}/man1/remmina-gnome.1.* %changelog +* Wed Jan 19 2022 Phil Wyett - 1.4.23-2 +- Remove unneeded BuildRequires for gtk-vnc-2.0. + libvncserver is the preferred for VNC and disables the gvnc plugin if found. + We have not in the recent past built the gvnc plugin. + +* Wed Jan 19 2022 Phil Wyett - 1.4.23-1 +- New upstream version 1.4.23. +- Enable x2go plugin. + * Wed Nov 10 2021 Simone Caronni - 1.4.21-1 - Update to 1.4.21. +* Tue Sep 14 2021 Sahana Prasad - 1.4.20-3 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 21 2021 Simone Caronni - 1.4.20-1 - Update to 1.4.20. - Remove unmaintained nx, st, xdmcp plugins. diff --git a/sources b/sources index 924e53d..d9b12b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (remmina-1.4.21.tar.gz) = cabcc7ce6fb5ca6949c2db626c2c336ec9666799a275d1604f2c5bb998113e98fbf392bd7a211952e41f12dcdbae14ac5299e857d9a81cc31a746ee9011c99b4 +SHA512 (remmina-1.4.23.tar.gz) = 2fc175d4e81483dcd00bad4a1e62077952d89961f0bf1825c30459fa57b198b646658b456525a278b18550e458c05c450bab991b3c5cba00675dcedb481965a2