[X2Go-Commits] [x2goclient] 70/94: pyhoca-cli.spec: either EL6 or EL7, not both at the same time.

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.6.1.0
in repository x2goclient.

commit 55d4bfc1a61798110794ef5d03452dfc659c08a8
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 10 12:57:57 2018 +0100

    pyhoca-cli.spec: either EL6 or EL7, not both at the same time.
---
 debian/changelog | 1 +
 pyhoca-cli.spec  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4036706..68a85d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ pyhoca-cli (0.6.0.1-0x2go1) UNRELEASED; urgency=medium
     - Build with Python 2 on CentOS, drop python3-argparse
       dependency (part of stdlib).
     - It's still %endif, not %fi.
+    - Either EL6 or EL7, not both at the same time.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 19 Sep 2018 15:20:43 +0200
 
diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec
index 6e2c7bdf..e28e2257 100644
--- a/pyhoca-cli.spec
+++ b/pyhoca-cli.spec
@@ -13,7 +13,7 @@ URL:            http://www.x2go.org/
 Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
-%if 0%{?el6} && 0%{?el7}
+%if 0%{?el6} || 0%{?el7}
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-setproctitle
@@ -50,7 +50,7 @@ on desktops and thin clients.
 
 
 %build
-%if 0%{?el6} && 0%{?el7}
+%if 0%{?el6} || 0%{?el7}
 # Make sure we stay on Python 2 on CentOS for the time being. Maybe not for EL8.
 %{__python2} setup.py build
 %else

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