This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit f2f436bc416f518af940548173b24decc7042c47 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Oct 28 06:46:02 2019 +0100 x2gokdrive.spec: untangle libjpeg-turbo-devel build-dependency. Recent *SuSE versions define a pkgconfig(libturbojpeg) virtual provide, which is unheard of in RHEL land. Older *SuSE versions sadly don't have any virtual provide for this, and, worse, don't even have libjpeg-turbo-devel packages, so we'll need to build-depend upon libjpeg62-devel instead and hope that this is actually the turbo variant. RHEL-land (including Fedora) is more forgiving and always ships the turbo variant, but sets the virtual provide to pkgconfig(libjpeg) (yes, for all versions down to RHEL 6, albit via the updates repository!) and do not mention "turbo" in there. --- debian/changelog | 9 +++++++++ x2gokdrive.spec | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 12b3aca..8e7688e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,15 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium a libgcrypt pkgconfig() virtual provide. That means: Fedora < 29, EPEL < 8 and any *SuSE version that is not Tumbleweed. The most surprising part is probably *SuSE. + + Untangle libjpeg-turbo-devel build-dependency. Recent *SuSE versions + define a pkgconfig(libturbojpeg) virtual provide, which is unheard of in + RHEL land. Older *SuSE versions sadly don't have any virtual provide for + this, and, worse, don't even have libjpeg-turbo-devel packages, so we'll + need to build-depend upon libjpeg62-devel instead and hope that this is + actually the turbo variant. RHEL-land (including Fedora) is more + forgiving and always ships the turbo variant, but sets the virtual + provide to pkgconfig(libjpeg) (yes, for all versions down to RHEL 6, + albit via the updates repository!) and do not mention "turbo" in there. * debian/rules: + Remove weird empty variable reference construct. + Whitespace-only fixes. diff --git a/x2gokdrive.spec b/x2gokdrive.spec index 963b448..e19f28d 100644 --- a/x2gokdrive.spec +++ b/x2gokdrive.spec @@ -24,7 +24,22 @@ Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version} # Required specifically for x2gokdrive BuildRequires: xorg-x11-server-source -BuildRequires: libjpeg-turbo-devel +# Selecting libjpeg-turbo is quite difficult. +%if 0%{?suse_version} +%if 0%{?sle_version} >= 120200 +# Recent *SuSE versions call this "libturbojpeg". +BuildRequireS: pkgconfig(libturbojpeg) +%else +# Older ones have either libjpeg8-devel or libjpeg62-devel and don't define +# any pkgconfig() virtual provide. Pick libjpeg62-devel since that's most +# likely the turbo variant. +BuildRequires: libjpeg62-devel +%endif +%else +# RHEL/CentOS 6+ and all supported Fedora versions ship libjpeg-turbo, but call +# it libjpeg. +BuildRequires: pkgconfig(libjpeg) +%endif BuildRequires: libpng-devel BuildRequires: quilt %if 0%{?suse_version} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git