public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Orion Poplawski <orion@nwra.com>
To: git-commits@fedoraproject.org
Subject: [rpms/x2goclient] rawhide: Drop old conditionals
Date: Sat, 18 Jul 2026 04:11:18 GMT [thread overview]
Message-ID: <178434787828.1.7384784639758124539.rpms-x2goclient-8bfb60cdde48@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/x2goclient
Branch : rawhide
Commit : 8bfb60cdde48e9328a50de37233de1047676ebc6
Author : Orion Poplawski <orion@nwra.com>
Date : 2026-07-17T22:09:48-06:00
Stats : +0/-36 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/x2goclient/c/8bfb60cdde48e9328a50de37233de1047676ebc6?branch=rawhide
Log:
Drop old conditionals
[skip changelog]
---
diff --git a/x2goclient.spec b/x2goclient.spec
index 4d9388f..aaea08d 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -29,20 +29,12 @@ BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: libssh-devel
BuildRequires: libXpm-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: man2html-core
-%else
-BuildRequires: man
-%endif
BuildRequires: openldap-devel
-%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: pkgconfig(Qt5)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: qt5-linguist
-%else
-BuildRequires: qt-devel
-%endif
Requires: hicolor-icon-theme
Requires: nxproxy
# For GSSAPI authenticated connections
@@ -50,10 +42,6 @@ Requires: openssh-clients
# For local folder sharing and printing
Requires: openssh-server
Obsoletes: x2goplugin < 4.1.2.1
-%if 0%{?rhel} == 7
-# libssh is x86_64 only for EL7
-ExclusiveArch: x86_64
-%endif
%description
X2Go is a server-based computing environment with
@@ -75,18 +63,12 @@ You can use it to connect to running sessions and start new sessions.
sed -i -e 's/-o root -g root//' Makefile
sed -i -e '/^MOZPLUGDIR=/s/lib/%{_lib}/' Makefile
sed -i -e '/^MAKEOVERRIDES *=/d' Makefile
-%if 0%{?fedora} || 0%{?rhel} >= 8
sed -i -e 's/qt4/qt5/' Makefile
-%endif
sed -i -e '/^LIBS /s/$/ -ldl/' x2goclient.pro
%build
-%if 0%{?fedora} || 0%{?rhel} >= 8
export PATH=%{_qt5_bindir}:$PATH
-%else
-export PATH=%{_qt4_bindir}:$PATH
-%endif
%make_build
@@ -101,24 +83,6 @@ appstream-util validate-relax \
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &>/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 || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-%endif
-
-
%files
%license COPYING LICENSE
%doc AUTHORS
reply other threads:[~2026-07-18 4:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178434787828.1.7384784639758124539.rpms-x2goclient-8bfb60cdde48@fedoraproject.org \
--to=orion@nwra.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox