From 7a2b55b6265d18e0456847a83fe4e90c2ffbe57b Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 5 Jun 2021 13:07:40 -0700 Subject: [PATCH] set enabled Python bindings uniformly on RHEL/CentOS 0af0dc91894f2598f0e19e3cd2c1b34925c9cd61 introduced a workaround for Python packages changing names. This was relevant in the era of CentOS 6. However, now Graphviz no longer supports CentOS 6 and furthermore CentOS 7 has converged on the same naming as CentOS 8. As a result, the Graphviz packaging work flow was actually *disabling* Python 3 bindings and enabling Python 2 bindings on CentOS 7. This change unifies which Python bindings are enabled across RHEL and CentOS versions. Though an upcoming change will remove support for the Python 2 bindings altogether. Related to #1992. --- CHANGELOG.md | 2 ++ redhat/graphviz.spec.fedora.in | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fbbb96a8..677438781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Perl is no longer required to build Graphviz #2067 - nop more reliably returns success and failure exit statuses - implicit 63 character limit on plugin names is removed in GVC +- the packaging work flow on CentOS 7 now selects the Python 3 bindings, instead + of Python 2 bindings ### Fixed diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in index 9079c01f6..05406f42e 100644 --- a/redhat/graphviz.spec.fedora.in +++ b/redhat/graphviz.spec.fedora.in @@ -51,15 +51,9 @@ Source0: https://gitlab.com/graphviz/graphviz/-/archive/@VERSION@/graphviz-@VERS %global GTK 0 %global JAVASCRIPT 0 %global LASI 0 -%if 0%{?rhel} >= 8 %global PYTHON 0 %global PYTHON2 1 %global PYTHON3 1 -%else -%global PYTHON 1 -%global PYTHON2 0 -%global PYTHON3 0 -%endif %global SHARP 0 %global WEBP 0 %endif -- 2.40.0