[X2Go-Commits] [nx-libs] 01/01: nx-libs.spec: fix nxdialog hashbang selection, especially on *SuSE.

git-admin at x2go.org git-admin at x2go.org
Thu Feb 23 12:19:59 CET 2023


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit d35c5d011a951ee8d331dfbe940d87fa7c98945e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Feb 23 12:19:14 2023 +0100

    nx-libs.spec: fix nxdialog hashbang selection, especially on *SuSE.
---
 nx-libs.spec | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nx-libs.spec b/nx-libs.spec
index 84140f381..d4370c7eb 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -478,8 +478,20 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
 rm %{buildroot}%{_libdir}/*.la
 
 # Fix python scripts
-%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 || 0%{?py_ver} == 3
-sed -i '1 s/python/python3/' %{buildroot}%{_bindir}/nxdialog
+%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1500
+sed -i -e '1c\
+%{_bindir}/python3' '%{buildroot}%{_bindir}/nxdialog'
+%else
+sed -i -e '1c\
+%{_bindir}/python2' '%{buildroot}%{_bindir}/nxdialog'
+%endif
+%else
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog'
+%else
+pathfix.py -pni "%{__python2} %{py2_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog'
+%endif
 %endif
 
 %if 0%{?fdupes:1}

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list