[X2Go-Commits] [x2gokdrive] 07/08: x2gokdrive.spec: build-depend upon libgcrypt-devel for "older" distros that don't define a libgcrypt pkgconfig() virtual provide.

git-admin at x2go.org git-admin at x2go.org
Mon Oct 28 06:47:20 CET 2019


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

x2go pushed a commit to branch master
in repository x2gokdrive.

commit 071c8b4e3e8aab7bdfdeb6a5d261ee1e40b60439
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Oct 28 06:41:19 2019 +0100

    x2gokdrive.spec: build-depend upon libgcrypt-devel for "older" distros that don't define 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.
---
 debian/changelog | 4 ++++
 x2gokdrive.spec  | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cfcddcb..12b3aca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,10 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
       source tarball is extracted - but we also need a BUILD sub-directory.
       Create it.
     + Use pushd instead of cd. Minor change.
+    + Build-depend upon libgcrypt-devel for "older" distros that don't define
+      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.
   * debian/rules:
     + Remove weird empty variable reference construct.
     + Whitespace-only fixes.
diff --git a/x2gokdrive.spec b/x2gokdrive.spec
index 5c0d9ee..963b448 100644
--- a/x2gokdrive.spec
+++ b/x2gokdrive.spec
@@ -93,7 +93,13 @@ BuildRequires:  pkgconfig(xfont)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  pkgconfig(pciaccess)
+%if 0%{?fedora} > 28 || 0%{?rhel} > 7 || 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(libgcrypt)
+%else
+# Older libgcrypt-devel packages do not have a pkgconfig(libgcrypt) provides
+# line.
+BuildRequires:  libgcrypt-devel
+%endif
 BuildRequires:  pkgconfig(nettle)
 # We probably won't need some libudev-devel equivalent because we disable that
 # feature anyway.

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


More information about the x2go-commits mailing list