From bd03c12a668e857c724d047ffcfb4e8fb74df688 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Fri, 6 Sep 2019 22:25:20 +0200 Subject: [PATCH] Allow building on RHEL/CentOS 7 --- remmina.spec | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/remmina.spec b/remmina.spec index ba730f8..8d94049 100644 --- a/remmina.spec +++ b/remmina.spec @@ -2,7 +2,7 @@ Name: remmina Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.org @@ -16,7 +16,11 @@ Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina- Source1: pluginBuild-CMakeLists.txt BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8 +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: cmake >= 3.0.0 +%else +BuildRequires: cmake3 +%endif BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: harfbuzz-devel @@ -43,6 +47,7 @@ BuildRequires: pkgconfig(xkbfile) # We don't ship the remmina-plugins-telepathy package any longer Obsoletes: %{name}-plugins-telepathy < %{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: %{name}-plugins-exec Recommends: %{name}-plugins-nx Recommends: %{name}-plugins-rdp @@ -50,6 +55,15 @@ Recommends: %{name}-plugins-secret Recommends: %{name}-plugins-st Recommends: %{name}-plugins-vnc Recommends: %{name}-plugins-xdmcp +%else +Requires: %{name}-plugins-exec +Requires: %{name}-plugins-nx +Requires: %{name}-plugins-rdp +Requires: %{name}-plugins-secret +Requires: %{name}-plugins-st +Requires: %{name}-plugins-vnc +Requires: %{name}-plugins-xdmcp +%endif %description Remmina is a remote desktop client written in GTK+, aiming to be useful for @@ -229,7 +243,11 @@ mkdir -p build # Workaround for Pango on Fedora 31+ export CFLAGS="%{optflags} -I%{_includedir}/harfbuzz" +%if 0%{?fedora} || 0%{?rhel} >= 8 %cmake --build=build \ +%else +%cmake3 --build=build \ +%endif -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWITH_APPINDICATOR=ON \ @@ -329,6 +347,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %{_mandir}/man1/remmina-gnome.1.* %changelog +* Fri Sep 06 2019 Simone Caronni - 1.3.5-3 +- Allow building on RHEL/CentOS 7. + * Tue Aug 20 2019 Simone Caronni - 1.3.5-2 - Enable KDE Wallet plugin.