From e2415e7b4f1c5d3fba37ab00ff74508342394191 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Aug 2019 09:10:48 -0500 Subject: [PATCH 1/4] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 6432840a69d243c85b703904b50fda8f7fb9ba8f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 15 Aug 2019 15:59:46 -0600 Subject: [PATCH 2/4] Use Suggests with RHEL8 --- x2goserver.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index b613db8..c04def6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -60,7 +60,7 @@ Requires(post): x2goserver-common %{?systemd_requires} %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: x2goserver-fmbindings = %{version}-%{release} Suggests: x2goserver-printing = %{version}-%{release} %endif @@ -71,7 +71,7 @@ Requires: x2goserver-xsession = %{version}-%{release} Obsoletes: x2goserver-extensions < %{version}-%{release} Provides: x2goserver-extensions = %{version}-%{release} Requires: x2goserver-xsession -%if 0%{?fedora} >= 21 +%if 0%{?fedora} || 0%{?rhel} >= 8 Suggests: x2goserver-fmbindings Suggests: x2goserver-printing %endif @@ -188,7 +188,7 @@ Requires: %{name} = %{version}-%{release} Requires: perl(Cwd) # Symlinks to xinit files Requires: xorg-x11-xinit -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 8 Requires: dbus %endif BuildArch: noarch From b8a23586f6c5af4259eac7900af4123f5b6775a2 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:58:18 +0000 Subject: [PATCH 3/4] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 3758a3fcdb87e977ade0ef693225b661483ec692 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 15 Feb 2022 08:52:09 -0700 Subject: [PATCH 4/4] Require xorg-x11-apps instead of xmessage --- x2goserver.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x2goserver.spec b/x2goserver.spec index 1af49a5..ef36d0a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -2,7 +2,7 @@ Name: x2goserver Version: 4.1.0.3 -Release: 17%{?dist} +Release: 17%{?dist}.1 Summary: X2Go Server License: GPLv2+ @@ -190,7 +190,8 @@ Summary: X2Go Server Xsession runner Requires: %{name} = %{version}-%{release} # Not detected automatically Requires: perl(Cwd) -Requires: xmessage +# For xmessage +Requires: xorg-x11-apps # Symlinks to xinit files Requires: xorg-x11-xinit %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -575,6 +576,9 @@ exit 0 %changelog +* Tue Feb 15 2022 Orion Poplawski - 4.1.0.3-17.1 +- Require xorg-x11-apps instead of xmessage + * Fri Feb 04 2022 Orion Poplawski - 4.1.0.3-17 - Add upstream patch to fix x2goversion (bz#2050350)