The package rpms/remmina.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/remmina.git/commit/?id=4cf6739863....
Change:
+ExcludeArch: aarch64
Thanks.
Full change:
============
commit aab7f2e5a4d278636b5c4c52f03448a7d6d4662e
Merge: b14c5d3 072d6e8
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Sun Feb 27 10:29:36 2022 +0000
Merge branch 'rawhide' into f36
commit 072d6e879c6e994c473ce15c1e0194c779d7aa23
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Sun Feb 27 10:11:27 2022 +0000
Bugfix release 1.4.24-3.
diff --git a/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
b/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
new file mode 100644
index 0000000..8fa2598
--- /dev/null
+++ b/0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
@@ -0,0 +1,39 @@
+diff --git a/src/rcw.c b/src/rcw.c
+index 0c3e591b045d2d06aa1aee1559041aa80edc2542..b750a16cb5d1387b61b1f14be325487f62e45b8a
100644
+--- a/src/rcw.c
++++ b/src/rcw.c
+@@ -3399,6 +3399,7 @@ void rco_closewin(RemminaProtocolWidget *gp)
+ if (cnnobj) {
+ cnnobj->remmina_file = NULL;
+ g_free(cnnobj);
++ gp->cnnobj = NULL;
+ }
+
+ remmina_application_condexit(REMMINA_CONDEXIT_ONDISCONNECT);
+diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
+index 7a7fbc44b2a28f5fe18f7409de2772234e17104a..307342009f493787d44f9b5cc34060ac7de4cb1d
100644
+--- a/src/remmina_protocol_widget.c
++++ b/src/remmina_protocol_widget.c
+@@ -1519,6 +1519,9 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer
user_data)
+ RemminaMessagePanel *mp;
+ const gchar *s;
+
++ if (d->gp->cnnobj == NULL)
++ return;
++
+ mp = remmina_message_panel_new();
+
+ if (d->dtype == RPWDT_AUTH) {
+diff --git a/src/remmina_protocol_widget.c b/src/remmina_protocol_widget.c
+index 307342009f493787d44f9b5cc34060ac7de4cb1d..9a7099c9c631bc3785540ef0fb685e40d7f68da9
100644
+--- a/src/remmina_protocol_widget.c
++++ b/src/remmina_protocol_widget.c
+@@ -1520,7 +1520,7 @@ static gboolean remmina_protocol_widget_dialog_mt_setup(gpointer
user_data)
+ const gchar *s;
+
+ if (d->gp->cnnobj == NULL)
+- return;
++ return FALSE;
+
+ mp = remmina_message_panel_new();
+
diff --git a/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
b/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
new file mode 100644
index 0000000..af52209
--- /dev/null
+++ b/0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
@@ -0,0 +1,10 @@
+diff --git a/data/desktop/remmina-gnome.session b/data/desktop/remmina-gnome.session
+index 15c883aae42c170cbe07f892b20b48c708bf750d..08e43f87d832dc682003204b6fb8bf5f56b31acd
100644
+--- a/data/desktop/remmina-gnome.session
++++ b/data/desktop/remmina-gnome.session
+@@ -2,4 +2,4 @@
+
+ [GNOME Session]
+ Name=remmina-gnome
+-RequiredComponents=org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;remmina-gnome
++RequiredComponents=org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;remmina-gnome
diff --git a/remmina.spec b/remmina.spec
index 8515dd9..6acd577 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -2,7 +2,7 @@
Name: remmina
Version: 1.4.24
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Remote Desktop Client
License: GPLv2+ and MIT
URL:
https://remmina.org
@@ -20,6 +20,10 @@ ExcludeArch: aarch64
# So we can't use it directly only as instructions.
Source1: pluginBuild-CMakeLists.txt
+# Patches.
+Patch0: 0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch
+Patch1: 0002_drop_gnome_mediakeys_plugin_git_c901beef.patch
+
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: cmake
%else
@@ -203,8 +207,6 @@ that shows up under the display manager session menu.
%autosetup -p1 -n Remmina-v%{version}-%{release_commit_hash}
%build
-mkdir -p build
-
%if 0%{?fedora}
# Workaround for Pango on Fedora 31+.
export CFLAGS="%{optflags} -I%{_includedir}/harfbuzz"
@@ -230,7 +232,6 @@ export CFLAGS="%{optflags} -std=gnu99"
-DWITH_TELEPATHY=OFF \
-DWITH_VTE=ON \
-DWITH_X2GO=ON
-
%cmake3_build
%install
@@ -327,6 +328,11 @@ fi
%{_mandir}/man1/remmina-gnome.1.*
%changelog
+* Sun Feb 27 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.24-3
+- Add patch: 0001_fix_rare_crash_git_2609548e_and_9ed4c438.patch.
+- Add patch: 0002_drop_gnome_mediakeys_plugin_git_c901beef.patch.
+- Remove unneeded creation of 'build' folder.
+
* Sat Feb 12 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.24-2
- Remove XDMCP reference from remmina package description.
- Remove pyhoca-cli BuildRrequires. Only Requires on x2go now required.
commit 85404cd9b8540427d1f6b88445d866f5f6b0c8e7
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Sun Feb 13 08:49:19 2022 +0000
Remove unnecessary version constraints on BuildRequires.
diff --git a/remmina.spec b/remmina.spec
index 759bfaf..8515dd9 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -21,7 +21,7 @@ ExcludeArch: aarch64
Source1: pluginBuild-CMakeLists.txt
%if 0%{?fedora} || 0%{?rhel} >= 8
-BuildRequires: cmake >= 3.0.0
+BuildRequires: cmake
%else
BuildRequires: cmake3
%endif
@@ -37,14 +37,14 @@ BuildRequires: libgcrypt-devel
BuildRequires: libsodium-devel
BuildRequires: xdg-utils
BuildRequires: pkgconfig(appindicator3-0.1)
-BuildRequires: pkgconfig(avahi-ui) >= 0.6.30
-BuildRequires: pkgconfig(avahi-ui-gtk3) >= 0.6.30
+BuildRequires: pkgconfig(avahi-ui)
+BuildRequires: pkgconfig(avahi-ui-gtk3)
BuildRequires: pkgconfig(freerdp2)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(libssh) >= 0.6
+BuildRequires: pkgconfig(libssh)
BuildRequires: pkgconfig(libvncserver)
BuildRequires: pkgconfig(spice-client-gtk-3.0)
BuildRequires: pkgconfig(vte-2.91)
commit 4cf67398632fe78fff05135d73f5470a07521136
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Sat Feb 12 19:44:11 2022 +0000
Various updates.
diff --git a/remmina.spec b/remmina.spec
index 31d469b..759bfaf 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -2,16 +2,16 @@
Name: remmina
Version: 1.4.24
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Remote Desktop Client
License: GPLv2+ and MIT
-URL:
http://remmina.org
+URL:
https://remmina.org
Source0:
https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-%{versio...
# Exclude el7 from building on aarch64.
%if 0%{?rhel} == 7
-ExcludeArch: aarch64
+ExcludeArch: aarch64
%endif
# Cmake helper file to easy build plugins outside remmina source tree
@@ -35,9 +35,6 @@ 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: xdg-utils
BuildRequires: pkgconfig(appindicator3-0.1)
BuildRequires: pkgconfig(avahi-ui) >= 0.6.30
@@ -250,6 +247,7 @@ cp -p %{SOURCE1} %{buildroot}/%{_includedir}/%{name}/
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
+# Manually trigger icon cache generation on el7 only.
%if 0%{?rhel} == 7
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -329,6 +327,11 @@ fi
%{_mandir}/man1/remmina-gnome.1.*
%changelog
+* Sat Feb 12 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.24-2
+- Remove XDMCP reference from remmina package description.
+- Remove pyhoca-cli BuildRrequires. Only Requires on x2go now required.
+- Use upstream projects HTTPS URL.
+
* Thu Feb 10 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.24-1
- New upstream version 1.4.24.
commit cb2aa22829907370dd66e6384bf633a381c4c732
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Thu Feb 10 19:21:15 2022 +0000
Remove obsolete XDMCP from description.
diff --git a/remmina.spec b/remmina.spec
index 51aa272..31d469b 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -77,7 +77,7 @@ system administrators and travelers, who need to work with lots of
remote
computers in front of either large monitors or tiny net-books.
Remmina supports multiple network protocols in an integrated and consistent
-user interface. Currently RDP, VNC, XDMCP and SSH are supported.
+user interface. Currently RDP, VNC and SSH are supported.
Please don't forget to install the plugins for the protocols you want to use.
commit 588d24fe59e1a6edfcda58a5f43e01e7f32fb43b
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Thu Feb 10 16:11:38 2022 +0000
New upstream version 1.4.24.
diff --git a/.gitignore b/.gitignore
index 38cbe28..1fbd7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ remmina-0.7.5.tar.gz
/remmina-1.4.20.tar.gz
/remmina-1.4.21.tar.gz
/remmina-1.4.23.tar.gz
+/remmina-1.4.24.tar.gz
diff --git a/remmina.spec b/remmina.spec
index 462d48e..51aa272 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -1,8 +1,8 @@
-%global release_commit_hash a03c1648a090458736434c77c0be00a7cf9cc44b
+%global release_commit_hash ffa6a7ef9c6be7951bac23d14df148098fd2d3fa
Name: remmina
-Version: 1.4.23
-Release: 4%{?dist}
+Version: 1.4.24
+Release: 1%{?dist}
Summary: Remote Desktop Client
License: GPLv2+ and MIT
URL:
http://remmina.org
@@ -329,6 +329,9 @@ fi
%{_mandir}/man1/remmina-gnome.1.*
%changelog
+* Thu Feb 10 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.24-1
+- New upstream version 1.4.24.
+
* Sun Jan 23 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.23-4
- Add missing xdg-utils BuildRequires for generation of icon and theme caches.
- Modify conditional to exclude el7 only from aarch64 builds. Will
diff --git a/sources b/sources
index d9b12b5..6e78639 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (remmina-1.4.23.tar.gz) =
2fc175d4e81483dcd00bad4a1e62077952d89961f0bf1825c30459fa57b198b646658b456525a278b18550e458c05c450bab991b3c5cba00675dcedb481965a2
+SHA512 (remmina-1.4.24.tar.gz) =
6314c6f4cbcefe5eb35b8bec85e7b57324e1e40b1de26b728a324f39922c7160871514b9efd9bbfa2db02af21b98f17f10c89786431adee2450735c7ab0e65a7