[X2Go-Commits] [nx-libs] 01/01: Quickfix for glibc RPC situation on OpenSuSE Tumbleweed.

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit 29451dbdf95bb7d8744e4c8852f3727b977c2d51
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Mar 6 01:39:40 2018 +0100

    Quickfix for glibc RPC situation on OpenSuSE Tumbleweed.
---
 nx-X11/lib/src/ConnDis.c             | 4 ++--
 nx-X11/programs/Xserver/os/rpcauth.c | 4 ++--
 nx-libs.spec                         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nx-X11/lib/src/ConnDis.c b/nx-X11/lib/src/ConnDis.c
index dfc0227..9df9db2 100644
--- a/nx-X11/lib/src/ConnDis.c
+++ b/nx-X11/lib/src/ConnDis.c
@@ -844,10 +844,10 @@ _XSendClientPrefix(
 
 
 #ifdef SECURE_RPC
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #ifdef ultrix
 #include <time.h>
-#include <rpc/auth_des.h>
+#include <tirpc/rpc/auth_des.h>
 #endif
 #endif
 
diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c
index 678bedf..e5f2822 100644
--- a/nx-X11/programs/Xserver/os/rpcauth.c
+++ b/nx-X11/programs/Xserver/os/rpcauth.c
@@ -44,7 +44,7 @@ from The Open Group.
 #include "os.h"
 #include "dixstruct.h"
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #ifdef sun
 /* <rpc/auth.h> only includes this if _KERNEL is #defined... */
@@ -53,7 +53,7 @@ extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
 
 #ifdef ultrix
 #include <time.h>
-#include <rpc/auth_des.h>
+#include <tirpc/rpc/auth_des.h>
 #endif
 
 static enum auth_stat why;
diff --git a/nx-libs.spec b/nx-libs.spec
index cacc502..bbcea5b 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -122,8 +122,8 @@ BuildRequires:  xorg-x11-font-utils
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  zlib-devel
 
-# RPC headers. Fedora 28+ phased them out of glibc, like upstream did.
-%if 0%{?fedora} > 27
+# RPC headers. Fedora 28+ and OpenSuSE Tumbleweed phased them out of glibc, like upstream did.
+%if 0%{?fedora} > 27 || 0%{?suse_version} > 1500
 BuildRequires:  libtirpc-devel
 %endif
 

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