This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 9c469b6 patches.xorg/1.20.3: add actual (rebased) patches and potentially missing files. new aefe5c0 x2gokdrive.spec: change libunwind build-dependency and usage: for ppc64(be), use it when not on RHEL/CentOS (this includes *SuSE and Fedora) and for ppc64le, use it on RHEL/CentOS 8+ or when not on RHEL/CentOS. The 1 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: debian/changelog | 3 +++ x2gokdrive.spec | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit aefe5c07b14f68f4fa49dcb51f3d2b90da57d68e Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Nov 14 14:11:37 2019 +0100 x2gokdrive.spec: change libunwind build-dependency and usage: for ppc64(be), use it when not on RHEL/CentOS (this includes *SuSE and Fedora) and for ppc64le, use it on RHEL/CentOS 8+ or when not on RHEL/CentOS. --- debian/changelog | 3 +++ x2gokdrive.spec | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0cff656..4a9c746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,9 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium pull Mesa-devel in, leading to a compile failure. Do that manually. + Depend on/recommend x2goserver >= 4.1.0.4, backported from debian/control. + + Change libunwind build-dependency and usage: for ppc64(be), use it when + not on RHEL/CentOS (this includes *SuSE and Fedora) and for ppc64le, use + it on RHEL/CentOS 8+ or when not on RHEL/CentOS. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 794b97c..60d5e74 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -134,7 +134,25 @@ BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(auparse) # Same goes for pkgconfig(libdrm). BuildRequires: pkgconfig(gl) +%ifarch ppc64 +# ppc64(be) doesn't have libunwind at all within CentOS/EPEL and this won't +# change, because the architecture is deprecated. +%if !0%{?rhel} +# Older Fedora versions provided it, though, and we don't have to care for +# *SuSE at all, fortunately. BuildRequires: pkgconfig(libunwind) +%endif +%else +%ifarch ppc64le +# For ppc64le, libunwind is always provided by Fedora (if the architecture is +# supported) and for CentOS 8+. +# Let's assume that it's also available for *SuSE if supported. +%if 0%{?rhel} > 7 || !0%{?rhel} +BuildRequires: pkgconfig(libunwind) +%else +BuildRequires: pkgconfig(libunwind) +%endif +%endif BuildRequires: pkgconfig(xmuu) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(x11) @@ -347,7 +365,23 @@ autoreconf -fvi --disable-dri \ --disable-dri2 \ --disable-glamor \ +%ifarch ppc64 +%if !0%{?rhel} --enable-libunwind \ +%else + --disable-libunwind \ +%endif +%else +%ifarch ppc64le +%if 0%{?rhel} > 7 || !0%{?rhel} + --enable-libunwind \ +%else + --disable-libunwind \ +%endif +%else + --enable-libunwind \ +%endif +%endif --disable-libdrm \ --enable-unit-tests \ CPPFLAGS="${CPPFLAGS} %{?__global_cppflags} -DPRE_RELEASE=0" \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org