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=fd842e21ee....
Change:
-ExcludeArch: aarch64
Thanks.
Full change:
============
commit 0564cfae685f48ecfdd5afb45d7390b964857f39
Merge: 430ad93 fd842e2
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Mon May 23 04:19:29 2022 +0100
Merge branch 'rawhide' into f36
commit fd842e21ee21011691d62f5b5c57421015021c5b
Author: Phil Wyett <philip.wyett(a)kathenas.org>
Date: Mon May 23 04:16:41 2022 +0100
- Add libssh BuildRequires minimum required version of 0.8.0.
- Remove EL7 build support due to new libssh minimum required version.
- Remove telepathy plugin activation switch as no longer required.
- Eliminate cmake build folder warning.
diff --git a/remmina.spec b/remmina.spec
index f5762f2..fbadcf7 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -1,30 +1,24 @@
%global release_commit_hash fa11b6d1c1f20922b594cc2a8c204f9ea6592836
+# Use old cmake macro behaviour.
+%define __cmake_in_source_build 1
+
Name: remmina
Version: 1.4.26
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Remote Desktop Client
License: GPLv2+ and MIT
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
-%endif
-
# 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.
Source1: pluginBuild-CMakeLists.txt
-%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: cmake
-%else
-BuildRequires: cmake3
-%endif
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
@@ -37,10 +31,10 @@ BuildRequires: libgcrypt-devel
BuildRequires: libsodium-devel
BuildRequires: python3-devel
BuildRequires: xdg-utils
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
BuildRequires: pkgconfig(appindicator3-0.1)
%endif
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
BuildRequires: pkgconfig(avahi-ui)
BuildRequires: pkgconfig(avahi-ui-gtk3)
%endif
@@ -49,10 +43,10 @@ BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(libssh)
+BuildRequires: pkgconfig(libssh) >= 0.8.0
BuildRequires: pkgconfig(libvncserver)
BuildRequires: pkgconfig(libpcre2-8)
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
BuildRequires: pkgconfig(spice-client-gtk-3.0)
%endif
BuildRequires: pkgconfig(vte-2.91)
@@ -65,17 +59,10 @@ Obsoletes: %{name}-plugins-nx < %{version}-%{release}
Obsoletes: %{name}-plugins-st < %{version}-%{release}
Obsoletes: %{name}-plugins-xdmcp < %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 8
Recommends: %{name}-plugins-exec
Recommends: %{name}-plugins-rdp
Recommends: %{name}-plugins-secret
Recommends: %{name}-plugins-vnc
-%else
-Requires: %{name}-plugins-exec
-Requires: %{name}-plugins-rdp
-Requires: %{name}-plugins-secret
-Requires: %{name}-plugins-vnc
-%endif
%description
Remmina is a remote desktop client written in GTK+, aiming to be useful for
@@ -146,7 +133,7 @@ computers in front of either large monitors or tiny net-books.
This package contains the VNC plugin for the Remmina remote desktop
client.
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
%package plugins-spice
Summary: SPICE plugin for Remmina Remote Desktop Client
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -185,7 +172,7 @@ This package contains the KDE Wallet plugin for the Remmina remote
desktop
client. It will be activated automatically if KDE Wallet is installed and
running.
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
%package plugins-x2go
Summary: x2go plugin for Remmina Remote Desktop Client
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -232,19 +219,15 @@ that shows up under the display manager session menu.
export CFLAGS="%{optflags} -I%{_includedir}/harfbuzz"
%endif
-%if 0%{?rhel} == 7
-export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE"
-%endif
-
-%cmake3 \
+%cmake . \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
-DHAVE_LIBAPPINDICATOR=ON \
%else
-DHAVE_LIBAPPINDICATOR=OFF \
%endif
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
-DWITH_AVAHI=ON \
%else
-DWITH_AVAHI=OFF \
@@ -257,23 +240,22 @@ export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE"
-DWITH_LIBSSH=ON \
-DWITH_NEWS=OFF \
-DWITH_PYTHONLIBS=ON \
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
-DWITH_SPICE=ON \
%else
-DWITH_SPICE=OFF \
%endif
- -DWITH_TELEPATHY=OFF \
-DWITH_VTE=ON \
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
-DWITH_X2GO=ON
%else
-DWITH_X2GO=OFF
%endif
-%cmake3_build
+%cmake_build
%install
-%cmake3_install
+%cmake_install
mkdir -p %{buildroot}/%{_libdir}/cmake/%{name}/
cp -pr cmake/*.cmake %{buildroot}/%{_libdir}/cmake/%{name}/
@@ -286,21 +268,6 @@ 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 || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%endif
-
%files -f %{name}.lang
%license LICENSE
%doc AUTHORS ChangeLog README.md
@@ -341,7 +308,7 @@ fi
%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-vnc-ssh-symbolic.svg
%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-vnc-symbolic.svg
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
%files plugins-spice
%{_libdir}/remmina/plugins/remmina-plugin-spice.so
%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-spice-ssh-symbolic.svg
@@ -357,7 +324,7 @@ fi
%files plugins-python
%{_libdir}/remmina/plugins/remmina-plugin-python_wrapper.so
-%if 0%{?fedora} || 0%{?rhel} <= 8
+%if 0%{?fedora} || 0%{?rhel} == 8
%files plugins-x2go
%{_libdir}/remmina/plugins/remmina-plugin-x2go.so
%{_datadir}/icons/hicolor/*/emblems/org.remmina.Remmina-x2go-ssh-symbolic.svg
@@ -373,6 +340,12 @@ fi
%{_mandir}/man1/remmina-gnome.1.*
%changelog
+* Sun May 22 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.26-3
+- Add libssh BuildRequires minimum required version of 0.8.0.
+- Remove EL7 build support due to new libssh minimum required version.
+- Remove telepathy plugin activation switch as no longer required.
+- Eliminate cmake build folder warning.
+
* Thu May 19 2022 Phil Wyett <philip.wyett(a)kathenas.org> - 1.4.26-2
- Add some missing BuildRequires for calrity.
- Correctly disable spice plugin on EL9.