[X2Go-Commits] [x2goclient] 02/04: x2goclient.spec: EPEL packages need to depend upon pkgconfig for now, not pkg-config.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 5e7ccc9d8f56167f28fabc9433125462bc597349
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Oct 31 08:42:59 2018 +0100

    x2goclient.spec: EPEL packages need to depend upon pkgconfig for now, not pkg-config.
---
 debian/changelog | 1 +
 x2goclient.spec  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 251990a..1581d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
     - Add build-depend on pkg-config.
   * x2goclient.spec:
     - Build-depend on pkg-config.
+    - EPEL packages need to depend upon pkgconfig for now, not pkg-config.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 Jun 2018 00:39:28 +0200
 
diff --git a/x2goclient.spec b/x2goclient.spec
index f60359f..d47e4a8 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -43,7 +43,12 @@ BuildRequires:  libssh-devel >= 0.5.5-2.1x2go1
 BuildRequires:  libXpm-devel, libX11-devel
 %endif
 
+%if 0%{?el5} || 0%{?el6} || 0%{?el7}
+# EPEL still calls the package pkconfig for some reason.
+BuildRequires:  pkgconfig
+%else
 BuildRequires:  pkg-config
+%fi
 
 %if "%{?_vendor}" == "suse"
 BuildRequires:  fdupes update-desktop-files

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