This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from ec4f09add debian/rules: fix version detection on testing and unstable. new b536e9f91 nx-libs.spec: fix TIRPC usage on *SuSE 15.3+. new 288394c18 nx-libs.spec: only depend upon pathfix.py for Fedora 27+ and RHEL 7+. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-libs.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit b536e9f91f6c9cc851610943cd8e87dbf1f5f80c Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 23 14:29:38 2023 +0100 nx-libs.spec: fix TIRPC usage on *SuSE 15.3+. --- nx-libs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 86099de51..086602ee9 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -130,7 +130,7 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel # RPC headers. Fedora 28+ and OpenSuSE Tumbleweed phased them out of glibc, like upstream did. -%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 +%if 0%{?fedora} > 27 || ( 0%{?suse_version} && ( 0%{?suse_version} > 1500 || 0%{?sle_version} > 150200 ) ) BuildRequires: libtirpc-devel %endif @@ -439,7 +439,7 @@ LOCAL_LDFLAGS="%{__global_ldflags}" CDEBUGFLAGS="%{?__global_cppflags} %{?__global_cflags} %{?optflags}" IMAKE_DEFINES='' FORCE_TIRPC='NO' -%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500 +%if 0%{?fedora} > 27 || ( 0%{?suse_version} && ( 0%{?suse_version} > 1500 || 0%{?sle_version} > 150200 ) ) FORCE_TIRPC='YES' %endif IMAKE_DEFINES="-DUseTIRPC=${FORCE_TIRPC}" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 288394c18c6aa70faabb69fa3a021cfbd300b8df Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Feb 23 15:28:20 2023 +0100 nx-libs.spec: only depend upon pathfix.py for Fedora 27+ and RHEL 7+. On older systems, use a less sophisticated way to replace the hashbang. --- nx-libs.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nx-libs.spec b/nx-libs.spec index 086602ee9..30c64904e 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -134,7 +134,7 @@ BuildRequires: zlib-devel BuildRequires: libtirpc-devel %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?fedora} > 26 || 0%{?rhel} > 6 BuildRequires: /usr/bin/pathfix.py %endif @@ -491,10 +491,22 @@ sed -i -e '1c\ %{_bindir}/python2' '%{buildroot}%{_bindir}/nxdialog' %endif %else -%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 +# Unfortunately, pathfix.py is not available everywhere, so where it is not, +# we replace it in a less sophisticated way. +%if 0%{?fedora} > 22 || 0%{?rhel} > 7 +%if 0%{?fedora} > 26 || 0%{?rhel} > 7 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog' %else +sed -i -e '1c\ +%{__python3}' '%{buildroot}%{_bindir}/nxdialog' +%endif +%else +%if 0%{?rhel} > 6 pathfix.py -pni "%{__python2} %{py2_shbang_opts}" '%{buildroot}%{_bindir}/nxdialog' +%else +sed -i -e '1c\ +/usr/bin/python2' '%{buildroot}%{_bindir}/nxdialog' +%endif %endif %endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org